This commit was manufactured by cvs2svn to create tag
'Root_R0_8_0_Maintenance'.
diff --git a/.project b/.project
deleted file mode 100644
index 055e539..0000000
--- a/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2tools</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/doc/org.eclipse.uml2.diagram.doc-feature/.project b/doc/org.eclipse.uml2.diagram.doc-feature/.project
deleted file mode 100644
index 1b8a735..0000000
--- a/doc/org.eclipse.uml2.diagram.doc-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.doc-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/doc/org.eclipse.uml2.diagram.doc-feature/build.properties b/doc/org.eclipse.uml2.diagram.doc-feature/build.properties
deleted file mode 100644
index 07a1b14..0000000
--- a/doc/org.eclipse.uml2.diagram.doc-feature/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- copyright.txt,\
- license.html
-src.includes = epl-v10.html,\
- license.html
-root=rootfiles
diff --git a/doc/org.eclipse.uml2.diagram.doc-feature/copyright.txt b/doc/org.eclipse.uml2.diagram.doc-feature/copyright.txt
deleted file mode 100644
index 226a3ae..0000000
--- a/doc/org.eclipse.uml2.diagram.doc-feature/copyright.txt
+++ /dev/null
@@ -1,9 +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:
- Michael Golubev (Borland) - initial API and implementation
diff --git a/doc/org.eclipse.uml2.diagram.doc-feature/eclipse_update_120.jpg b/doc/org.eclipse.uml2.diagram.doc-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/doc/org.eclipse.uml2.diagram.doc-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/doc/org.eclipse.uml2.diagram.doc-feature/epl-v10.html b/doc/org.eclipse.uml2.diagram.doc-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/doc/org.eclipse.uml2.diagram.doc-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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "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. 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]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.uml2.diagram.doc-feature/feature.properties b/doc/org.eclipse.uml2.diagram.doc-feature/feature.properties
deleted file mode 100644
index b9f2dd4..0000000
--- a/doc/org.eclipse.uml2.diagram.doc-feature/feature.properties
+++ /dev/null
@@ -1,123 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 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
-###############################################################################
-
-featureName=UML2 Diagramming Documentation
-providerName=Eclipse.org
-updateSiteName=Model Development Tools (MDT) updates
-description=UML2 Diagramming Documentation
-copyrightURL=copyright.txt
-copyright=Copyright (c) 2006, 2007 Borland Software Corporation \n\
-All rights reserved. This program and the accompanying materials \n\
-are made available under the terms of the Eclipse Public License v1.0 \n\
-which accompanies this distribution, and is available at \n\
-http://www.eclipse.org/legal/epl-v10.html \n\
- \n\
-Contributors: \n\
- Michael Golubev (Borland) - initial API and implementation
-
-licenseURL=license.html
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
- - 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\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
diff --git a/doc/org.eclipse.uml2.diagram.doc-feature/feature.xml b/doc/org.eclipse.uml2.diagram.doc-feature/feature.xml
deleted file mode 100644
index 250ace5..0000000
--- a/doc/org.eclipse.uml2.diagram.doc-feature/feature.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.uml2.diagram.doc"
- label="%featureName"
- version="0.7.0.qualifier"
- provider-name="%providerName">
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/modeling/mdt/updates/"/>
- </url>
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.eclipse.uml2.diagram.doc"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/doc/org.eclipse.uml2.diagram.doc-feature/license.html b/doc/org.eclipse.uml2.diagram.doc-feature/license.html
deleted file mode 100644
index a9b560f..0000000
--- a/doc/org.eclipse.uml2.diagram.doc-feature/license.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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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/doc/org.eclipse.uml2.diagram.doc-feature/rootfiles/epl-v10.html b/doc/org.eclipse.uml2.diagram.doc-feature/rootfiles/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/doc/org.eclipse.uml2.diagram.doc-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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "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. 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]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/doc/org.eclipse.uml2.diagram.doc-feature/rootfiles/notice.html b/doc/org.eclipse.uml2.diagram.doc-feature/rootfiles/notice.html
deleted file mode 100644
index a9b560f..0000000
--- a/doc/org.eclipse.uml2.diagram.doc-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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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/doc/org.eclipse.uml2.diagram.doc/.cvsignore b/doc/org.eclipse.uml2.diagram.doc/.cvsignore
deleted file mode 100644
index a32fe23..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-*.jar
\ No newline at end of file
diff --git a/doc/org.eclipse.uml2.diagram.doc/.project b/doc/org.eclipse.uml2.diagram.doc/.project
deleted file mode 100644
index 1f369f8..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.doc</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/doc/org.eclipse.uml2.diagram.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.uml2.diagram.doc/META-INF/MANIFEST.MF
deleted file mode 100644
index 08e5512..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.doc; singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.help
-Eclipse-LazyStart: true
diff --git a/doc/org.eclipse.uml2.diagram.doc/about.html b/doc/org.eclipse.uml2.diagram.doc/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/doc/org.eclipse.uml2.diagram.doc/about.ini b/doc/org.eclipse.uml2.diagram.doc/about.ini
deleted file mode 100644
index 945d061..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/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/doc/org.eclipse.uml2.diagram.doc/about.mappings b/doc/org.eclipse.uml2.diagram.doc/about.mappings
deleted file mode 100644
index 529ce23..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/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/doc/org.eclipse.uml2.diagram.doc/about.properties b/doc/org.eclipse.uml2.diagram.doc/about.properties
deleted file mode 100644
index 2998a7d..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/about.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# /**
-# * <copyright>
-# *
-# * Copyright (c) 2006 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=UML2 Diagramming Documentation
-
-featureText=UML2 Diagramming Documentation\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Borland Software Corporation and others. 2006. All rights reserved.\n\
-\n\
-UML2 Diagramming based on Eclipse UML2 and GMF projects.\n\
-Visit http://www.eclipse.org/modeling/uml2
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/doc/org.eclipse.uml2.diagram.doc/build.properties b/doc/org.eclipse.uml2.diagram.doc/build.properties
deleted file mode 100644
index 9c86577..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-custom = true
diff --git a/doc/org.eclipse.uml2.diagram.doc/build.xml b/doc/org.eclipse.uml2.diagram.doc/build.xml
deleted file mode 100644
index c3e3409..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/build.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.uml2.diagram.doc" default="build.jars" basedir=".">
-
- <!-- Plug-in version. This is a HACK. Do not forget to update. -->
- <property name="pluginVersion" value="1.0.0"/>
-
- <property name="plugin" value="org.eclipse.uml2.diagram"/>
- <property name="docPlugin" value="org.eclipse.uml2.diagram.doc"/>
-
- <property name="filesToInclude" value="META-INF/,about.*,modeling*.png,plugin.*,doc.zip,toc.xml,index/**"/>
-
- <!-- Compiler settings. -->
- <property name="javacFailOnError" value="false"/>
- <property name="javacDebugInfo" value="on"/>
- <property name="javacVerbose" value="true"/>
- <property name="javacSource" value="1.4"/>
- <property name="javacTarget" value="1.4"/>
- <property name="compilerArg" value=""/>
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath"/>
-
- <property name="bundleJavacSource" value="${javacSource}"/>
- <property name="bundleJavacTarget" value="${javacTarget}"/>
- <property name="bundleBootClasspath" value="${bootclasspath}"/>
- <property name="basews" value="${ws}"/>
- <property name="baseos" value="${os}"/>
- <property name="basearch" value="${arch}"/>
- <property name="basenl" value="${nl}"/>
-
- <target name="init" depends="properties">
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="pluginTemp" value="${basedir}"/>
- <condition property="build.result.folder" value="${pluginTemp}/${docPlugin}">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="build.result.folder" value="${basedir}"/>
- <property name="temp.folder" value="${basedir}/temp.folder"/>
- <property name="plugin.destination" value="${basedir}"/>
- </target>
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
- </target>
-
- <target name="build.update.jar" depends="init" description="Build the plug-in: ${plugin} for an update site.">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <zip destfile="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.jar" basedir="${temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}" filesonly="false" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="build.jars" depends="init" description="Build all the jars for the plug-in: ${docPlugin}.">
- <!-- Execute a shell script that will create an ant javadoc script and then run it for us -->
- <exec executable="sh">
- <arg value="build/antJavadoc.sh"/>
- <arg value="${eclipse.home}/../eclipse"/>
- </exec>
-
- <antcall target="build.index"/>
-
- <!-- Zip up all of the documentation artifacts - references(including javadoc), images, tutorials, etc. -->
- <zip destfile="doc.zip" compress="true">
- <!-- Add new folders for documentation zip here. -->
- <zipfileset dir="references" prefix="references" excludes="**/impl,**/impl/**"/>
- </zip>
- </target>
-
- <target name="build.index" depends="init" description="Builds search index for the plug-in" if="eclipse.running">
- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
-
- <target name="build.sources" depends="init">
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}"/>
- <copy todir="${destination.temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}" failonerror="true" overwrite="false">
- <fileset dir="${basedir}" includes="${filesToInclude}"/>
- </copy>
- <eclipse.versionReplacer
- path="${destination.temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}"
- version="${pluginVersion}.${forceContextQualifier}"/>
- </target>
-
- <target name="build.zips" depends="init">
- </target>
-
- <target name="gather.sources" depends="init" if="destination.temp.folder">
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
- </target>
-
- <target name="clean" depends="init" description="Clean the plug-in: ${docPlugin} of all the zips, jars and logs created.">
- <delete file="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.jar"/>
- <delete file="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.zip"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: ${docPlugin}.">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="build.sources"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <antcall target="gather.sources">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <delete>
- <fileset dir="${temp.folder}" includes="**/*.bin.log" />
- </delete>
- <zip destfile="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
-</project>
diff --git a/doc/org.eclipse.uml2.diagram.doc/build/antJavadoc.sh b/doc/org.eclipse.uml2.diagram.doc/build/antJavadoc.sh
deleted file mode 100644
index d3af268..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/build/antJavadoc.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-
-# BEGIN CUSTOMIZATIONS
-
-# The plugin name
-pluginName="org.eclipse.uml2.diagram";
-
-# string labels for javadoc content
-windowTitle="UML2 Diagramming Javadoc";
-groupTitle="UML2 Diagramming";
-
-# files to exclude from javadoc process - use Ant syntax
-javadocExclusions="<exclude name=\"**/internal/**\"/> <exclude name=\"**/examples/**\"/> <exclude name=\"**/tests/**\"/>";
-
-# END CUSTOMIZATIONS
-
-##########################################################################
-
-debug=0; if [ $debug -gt 0 ]; then echo "[antJd] debug: "$debug; fi
-
-if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
-if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
-export PATH=${PATH}:${ANT_HOME}/bin
-
-# current directory - all but the name of this script, no trailing slash
-currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [ $debug -gt 0 ]; then echo "[antJd] currentPath: "$currentPath; fi
-
-# path to $buildID/eclipse/plugins, no trailing slash
-pluginPath=${currentPath%/$pluginName*}; if [ $debug -gt 0 ]; then echo "[antJd] pluginName: "$pluginName; echo "[antJd] pluginPath: "$pluginPath; fi
-
-# ant script to create and then execute
-antScript=$currentPath"/javadoc.xml"; if [ $debug -gt 0 ]; then echo "[antJd] antScript: "$antScript; fi
-
-# The eclipse directory
-eclipseDir=`cd $1; echo $PWD`; if [ $debug -gt 0 ]; then echo "[antJd] eclipseDir: "$eclipseDir; fi
-
-# The destination directory
-destDir=$currentPath/../references/javadoc; mkdir -p $destDir; destDir=`cd $destDir; echo $PWD`; # resolve relative path
-if [ $debug -gt 0 ]; then echo "[antJd] destDir: "$destDir; fi
-
-hasToken=`grep -c "@plugin@" $antScript".template"`;
-if [ $hasToken -gt 0 ]; then
- srcDir=$pluginPath/$pluginName/src; if [ $debug -gt 0 ]; then echo "[antJd] srcDir: "$srcDir; fi
- if [ -d "$srcDir" ]; then
- if [ `find $srcDir -name "*.java" | grep -c .` -eq 0 ]; then # must unpack zips first
- if [ $debug -gt 0 ]; then echo "[antJd] Unpacking *src.zip"; fi
- for f in `find $srcDir -name "*src.zip"`; do
- if [ $debug -gt 1 ]; then echo "[antJd] Unpack $f"; fi
- unzip -q -d $srcDir $f;
- done
- fi
- if [ $debug -gt 0 ]; then echo "[antJd] *.java in srcDir: "; echo "-----------------"; echo `find $srcDir -type f -name '*.java'`; echo "-----------------"; fi
- packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[ ]*//g' | dos2unix | sort | uniq | xargs | sed -e 's/ /:/g'`;
- if [ $debug -gt 1 ]; then echo "[antJd] packages1: "$packages; fi
- packages=`echo $packages | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`; # slash escape
- if [ $debug -gt 1 ]; then echo "[antJd] packages2: "$packages; fi
- sed -e "s/\@plugin\@/${packages}/g" $antScript.template > $antScript.template.tmp;
- else
- echo "[antJd] ERROR! "$srcDir" does not exist!";
- exit 1;
- fi
-else
- echo "[antJd] ERROR! "$currentPath"/javadoc.xml.template does not contain token @plugin@!";
- exit 1;
-fi
-
-# Finds plugins in the Workspace:
-pluginDirs=`find $pluginPath -name "${pluginName}*" -maxdepth 1 -type d -printf '%T@ %p\n' | sort -n | cut -f2 -d' '`;
-if [ $debug -gt 0 ]; then
- echo "[antJd] pluginDirs:";
- for pluginDir in $pluginDirs; do echo "[antJd] "$pluginDir; done
-fi
-
-### TODO?: missing emf/sdo/xsd plugins in $eclipseDir - need to copy them over or reference source so that all classes/packages (and thus @links) can be resolved
-
-# All the jars in the plugins directory
-classpath="."`find $eclipseDir/plugins -name "*.jar" -printf ":%p"`; if [ $debug -gt 0 ]; then echo "[antJd] classpath: "$classpath; fi
-
-# Calculates the packagesets and the calls to copyDocFiles
-packagesets="";
-copydocfiles="";
-for pluginDir in $pluginDirs; do
- pluginDir=`echo $pluginDir | sed -e 's/\/runtime$//g'`;
- srcDir=$pluginDir/src;
- if [ $debug -gt 0 ]; then echo "[antJd] srcDir: "$srcDir; fi
- if [ -d "$srcDir" ]; then
- # define what to include when javadoc'ing here:
- packagesets=$packagesets"<packageset dir=\"$srcDir\"> ";
- packagesets=$packagesets"<exclude name=\"$srcDir/**/doc-files/**\"/> ";
- packagesets=$packagesets""$javadocExclusions;
- packagesets=$packagesets"</packageset>";
- copydocfiles=$copydocfiles"<copyDocFiles pluginDir=\"$pluginDir\"/>";
- fi
-done
-if [ $debug -gt 0 ]; then
- echo "[antJd] packagesets:"; echo $packagesets;
- echo "[antJd] copydocfiles:"; echo $copydocfiles;
-fi
-
-# Finds the proper org.eclipse.platform.doc.isv jar
-docjar=`find $eclipseDir/plugins/ -name "org.eclipse.platform.doc.isv*.jar" -printf "%f"`; if [ $debug -gt 1 ]; then echo "[antJd] docjar: "$docjar; fi
-
-if [ -f $antScript.template ]; then
- true;
-else
- cp $antScript.template $antScript.template.tmp;
-fi
-
-# do replacements in template
-if [ $debug -gt 1 ]; then echo "[antJd] Replace @packagesets@ in the template ..."; fi
-packagesets=`echo $packagesets | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`;
-sed -e "s/\@packagesets\@/${packagesets}/g" $antScript.template.tmp > $antScript.template.tmp2;
-
-if [ $debug -gt 1 ]; then echo "[antJd] Replace @copydocfiles@ in the template ..."; fi
-copydocfiles=`echo $copydocfiles | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`;
-sed -e "s/\@copydocfiles\@/${copydocfiles}/g" $antScript.template.tmp2 > $antScript;
-
-#run ant to do javadoc build
-ant -f $antScript \
- -DdestDir="$destDir" \
- -Dclasspath="$classpath" \
- -DeclipseDir="$eclipseDir" \
- -Ddocjar="$docjar" \
- -DwindowTitle="$windowTitle" \
- -DgroupTitle="$groupTitle" \
- -Doverview="$currentPath/overview.html";
-
-# Clean up templates
-rm -f $antScript $antScript.template.tmp $antScript.template.tmp2;
-
-# Generate topics_Reference.xml (replacement for doclet).
-trXML=$currentPath"/../topics_Reference.xml";
-echo '<?xml version="1.0" encoding="UTF-8"?>' >> $trXML;
-echo '<?NLS TYPE="org.eclipse.help.toc"?>' >> $trXML;
-echo '<toc label="Reference">' >> $trXML;
-echo ' <topic label="API Reference" href="references/javadoc/overview-summary.html">' >> $trXML;
-for packSum in `find $destDir -name "package-summary.html" | sort`; do
- path=${packSum%/package-summary.html}; path=${path#$destDir/}; # org/eclipse/xsd/ecore/importer/taskdefs
- label=${path//\//.}; # org.eclipse.xsd.ecore.importer.taskdefs
- echo ' <topic label="'$label'" href="references/javadoc/'$path'/package-summary.html" />' >> $trXML;
-done
-echo ' </topic>' >> $trXML;
-echo '</toc>' >> $trXML;
\ No newline at end of file
diff --git a/doc/org.eclipse.uml2.diagram.doc/build/javadoc.xml.template b/doc/org.eclipse.uml2.diagram.doc/build/javadoc.xml.template
deleted file mode 100644
index e90d31a..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/build/javadoc.xml.template
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Plugin Javadoc" default="javadoc">
- <property name="destDir" value="doc"/>
- <property name="classpath" value="bin"/>
- <property name="overview" value="build/overview.html"/>
- <property name="eclipseDir" value="."/>
- <property name="docjar" value="org.eclipse.platform.doc.isv.jar"/>
-
- <!-- other properties that must be passed to this script include:
- windowTitle
- groupTitle
- -->
-
- <property environment="env"/>
- <property name="javaHome" value="${env.JAVA_HOME}"/>
-
- <property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
- <available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
-
- <!-- TODO Enable linking to the platform javadoc -->
- <!-- <target name="extractPlatformJavadoc" unless="platformJavadocExists">
- <exec executable="find">
- <arg value="${eclipseDir}/.."/>
- <arg value="-type"/>
- <arg value="d"/>
- <arg value="-name"/>
- <arg value="javadoc"/>
- </exec>
- <unzip src="${eclipseDir}/@docjar@" dest="${javadoc.link.location}/platform/"/>
- </target> -->
-
- <!-- TODO Enable linking to the platform javadoc -->
- <!-- <target name="javadoc" depends="extractPlatformJavadoc"> -->
-
- <target name="javadoc">
- <javadoc
- destdir="${destDir}"
- classpath="${classpath}"
- overview="${overview}"
-
- windowtitle="${windowTitle}"
- footer="Copyright 2006 IBM Corporation and others.<br> All Rights Reserved."
-
- access="protected"
- additionalparam="-breakiterator -tag model:X -tag generated:X -tag ordered:X"
- author="false"
- breakiterator="true"
- charset="UTF-8"
- docencoding="UTF-8"
- nodeprecated="false"
- nodeprecatedlist="false"
- noindex="false"
- nonavbar="false"
- notree="false"
- source="1.4"
- splitindex="true"
- use="true"
- version="true">
- <arg value="-J-Xmx180m"/>
-
- <link offline="true" href="http://java.sun.com/j2se/1.4/docs/api/" packagelistLoc="${javaHome}/docs/api/"/>
- <!-- TODO Enable link to platform documentation -->
- <!-- <link offline="true" href="/help/topic/org.eclipse.platform.doc.isv/reference/api/" packagelistLoc="${javadoc.link.location}/platform/reference/api/"/> -->
-
- <tag name="ignore" description="ignore" enabled="false"/>
- <tag name="generated" description="ignore" enabled="false"/>
- <tag name="model" description="ignore" enabled="false"/>
- <tag name="modifiable" description="ignore" enabled="false"/>
- <tag name="extends" description="ignore" enabled="false"/>
- <tag name="implements" description="ignore" enabled="false"/>
- <tag name="ordered" description="ignore" enabled="false"/>
-
- <!-- If you add a @ plugin @ below, don't forget to update the antjavadoc.sh file -->
-
- <group title="${groupTitle}" packages="@plugin@"/>
-
- <!-- If you add a @ plugin @ above, don't forget to update the antjavadoc.sh file -->
-
- @packagesets@
-
- </javadoc>
-
- <!-- make sure the doc-files are copied -->
- <macrodef name="copyDocFiles">
- <attribute name="pluginDir"/>
- <sequential>
- <copy todir="${destDir}" failonerror="false">
- <fileset dir="@{pluginDir}/src" includes="**/doc-files/**"/>
- </copy>
- </sequential>
- </macrodef>
-
- @copydocfiles@
-
- </target>
-</project>
\ No newline at end of file
diff --git a/doc/org.eclipse.uml2.diagram.doc/build/overview.html b/doc/org.eclipse.uml2.diagram.doc/build/overview.html
deleted file mode 100644
index 29be219..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/build/overview.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<!--
-/**
- * <copyright>
- *
- * Copyright (c) 2006 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>
- *
- * $Id: overview.html,v 1.1 2006/12/19 20:37:23 mgolubev Exp $
- */
--->
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-</head>
-<body bgcolor="white">
-<!-- XXX: -->
-<a name="details"></a>
-Please refer to the <a href="org/eclipse/uml2/diagram/common/draw2d/package-summary.html#details">org.eclipse.uml2.diagram.common.draw2d</a>
-package documentation for API details.
--->
-</body>
-</html>
diff --git a/doc/org.eclipse.uml2.diagram.doc/modeling32.png b/doc/org.eclipse.uml2.diagram.doc/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/doc/org.eclipse.uml2.diagram.doc/plugin.properties b/doc/org.eclipse.uml2.diagram.doc/plugin.properties
deleted file mode 100644
index 02678e9..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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=UML2 Diagrams Documentation Plug-in
-providerName=Eclipse.org
diff --git a/doc/org.eclipse.uml2.diagram.doc/plugin.xml b/doc/org.eclipse.uml2.diagram.doc/plugin.xml
deleted file mode 100644
index 491dd33..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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:
- Michael Golubev (Borland) - initial API and implementation
--->
-<plugin>
- <extension
- point="org.eclipse.help.toc">
- <toc file="toc.xml" primary="true"/>
- <index path="index"/>
- </extension>
-</plugin>
diff --git a/doc/org.eclipse.uml2.diagram.doc/references/.cvsignore b/doc/org.eclipse.uml2.diagram.doc/references/.cvsignore
deleted file mode 100644
index e69de29..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/references/.cvsignore
+++ /dev/null
diff --git a/doc/org.eclipse.uml2.diagram.doc/references/uml2tools-doc.xhtml b/doc/org.eclipse.uml2.diagram.doc/references/uml2tools-doc.xhtml
deleted file mode 100644
index bdb5307..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/references/uml2tools-doc.xhtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>UML2 Diagramming Documentation</title>
-<style type="text/css">
-/*<![CDATA[*/
-<!--
- /* Style Definitions */
-h1
- {margin-top:17.0pt;
- margin-right:0cm;
- margin-bottom:16.5pt;
- margin-left:0cm;
- text-align:justify;
- text-justify:inter-ideograph;
- line-height:240%;
- page-break-after:avoid;
- font-size:22.0pt;
- font-family:"Times New Roman";}
-div.Section1
- {page:Section1;}
--->
-/*]]>*/
-</style>
-
-</head>
-<body>
-<div class="Section1" style='layout-grid:15.6pt'>
-<h1 align="center" style='text-align:center'><span lang="EN-US"
-xml:lang="EN-US">UML2 Diagramming Documentation<br/>TBD</span></h1>
-</div>
-</body>
-</html>
diff --git a/doc/org.eclipse.uml2.diagram.doc/toc.xml b/doc/org.eclipse.uml2.diagram.doc/toc.xml
deleted file mode 100644
index a473164..0000000
--- a/doc/org.eclipse.uml2.diagram.doc/toc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="UML2 Diagramming Table of Contents">
- <topic label="Javadoc" href="references/javadoc/index.html"/>
-</toc>
diff --git a/doc/org.eclipse.uml2tools.doc-feature/.project b/doc/org.eclipse.uml2tools.doc-feature/.project
deleted file mode 100755
index 26d7ea6..0000000
--- a/doc/org.eclipse.uml2tools.doc-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2tools.doc-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/doc/org.eclipse.uml2tools.doc-feature/build.properties b/doc/org.eclipse.uml2tools.doc-feature/build.properties
deleted file mode 100755
index 07a1b14..0000000
--- a/doc/org.eclipse.uml2tools.doc-feature/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- copyright.txt,\
- license.html
-src.includes = epl-v10.html,\
- license.html
-root=rootfiles
diff --git a/doc/org.eclipse.uml2tools.doc-feature/copyright.txt b/doc/org.eclipse.uml2tools.doc-feature/copyright.txt
deleted file mode 100755
index 29ad511..0000000
--- a/doc/org.eclipse.uml2tools.doc-feature/copyright.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (c) 2006, 2007 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:
- Michael Golubev (Borland) - initial API and implementation
diff --git a/doc/org.eclipse.uml2tools.doc-feature/eclipse_update_120.jpg b/doc/org.eclipse.uml2tools.doc-feature/eclipse_update_120.jpg
deleted file mode 100755
index 68e3e02..0000000
--- a/doc/org.eclipse.uml2tools.doc-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/doc/org.eclipse.uml2tools.doc-feature/epl-v10.html b/doc/org.eclipse.uml2tools.doc-feature/epl-v10.html
deleted file mode 100755
index ed4b196..0000000
--- a/doc/org.eclipse.uml2tools.doc-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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "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. 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]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.uml2tools.doc-feature/feature.properties b/doc/org.eclipse.uml2tools.doc-feature/feature.properties
deleted file mode 100755
index bd36e34..0000000
--- a/doc/org.eclipse.uml2tools.doc-feature/feature.properties
+++ /dev/null
@@ -1,123 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 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
-###############################################################################
-
-featureName=UML2 Tools Documentation
-providerName=Eclipse.org
-updateSiteName=Model Development Tools (MDT) updates
-description=UML2 Tools Documentation
-copyrightURL=copyright.txt
-copyright=Copyright (c) 2006, 2007 Borland Software Corporation \n\
-All rights reserved. This program and the accompanying materials \n\
-are made available under the terms of the Eclipse Public License v1.0 \n\
-which accompanies this distribution, and is available at \n\
-http://www.eclipse.org/legal/epl-v10.html \n\
- \n\
-Contributors: \n\
- Michael Golubev (Borland) - initial API and implementation
-
-licenseURL=license.html
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
- - 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\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
diff --git a/doc/org.eclipse.uml2tools.doc-feature/feature.xml b/doc/org.eclipse.uml2tools.doc-feature/feature.xml
deleted file mode 100755
index a6f4527..0000000
--- a/doc/org.eclipse.uml2tools.doc-feature/feature.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.uml2tools.doc"
- label="%featureName"
- version="0.7.0.qualifier"
- provider-name="%providerName">
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/modeling/mdt/updates/"/>
- </url>
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.eclipse.uml2tools.doc"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/doc/org.eclipse.uml2tools.doc-feature/license.html b/doc/org.eclipse.uml2tools.doc-feature/license.html
deleted file mode 100755
index a9b560f..0000000
--- a/doc/org.eclipse.uml2tools.doc-feature/license.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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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/doc/org.eclipse.uml2tools.doc-feature/rootfiles/epl-v10.html b/doc/org.eclipse.uml2tools.doc-feature/rootfiles/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/doc/org.eclipse.uml2tools.doc-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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "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. 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]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/doc/org.eclipse.uml2tools.doc-feature/rootfiles/notice.html b/doc/org.eclipse.uml2tools.doc-feature/rootfiles/notice.html
deleted file mode 100644
index a9b560f..0000000
--- a/doc/org.eclipse.uml2tools.doc-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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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/doc/org.eclipse.uml2tools.doc/.cvsignore b/doc/org.eclipse.uml2tools.doc/.cvsignore
deleted file mode 100644
index a32fe23..0000000
--- a/doc/org.eclipse.uml2tools.doc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-*.jar
\ No newline at end of file
diff --git a/doc/org.eclipse.uml2tools.doc/.project b/doc/org.eclipse.uml2tools.doc/.project
deleted file mode 100755
index 80bede3..0000000
--- a/doc/org.eclipse.uml2tools.doc/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2tools.doc</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/doc/org.eclipse.uml2tools.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.uml2tools.doc/META-INF/MANIFEST.MF
deleted file mode 100755
index 0d68d23..0000000
--- a/doc/org.eclipse.uml2tools.doc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2tools.doc; singleton:=true
-Bundle-Version: 0.7.0.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.help
-Eclipse-LazyStart: true
diff --git a/doc/org.eclipse.uml2tools.doc/about.html b/doc/org.eclipse.uml2tools.doc/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/doc/org.eclipse.uml2tools.doc/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/doc/org.eclipse.uml2tools.doc/about.ini b/doc/org.eclipse.uml2tools.doc/about.ini
deleted file mode 100644
index 945d061..0000000
--- a/doc/org.eclipse.uml2tools.doc/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/doc/org.eclipse.uml2tools.doc/about.mappings b/doc/org.eclipse.uml2tools.doc/about.mappings
deleted file mode 100644
index 529ce23..0000000
--- a/doc/org.eclipse.uml2tools.doc/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/doc/org.eclipse.uml2tools.doc/about.properties b/doc/org.eclipse.uml2tools.doc/about.properties
deleted file mode 100644
index 939279e..0000000
--- a/doc/org.eclipse.uml2tools.doc/about.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# /**
-# * <copyright>
-# *
-# * Copyright (c) 2006 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=UML2 Tools Documentation
-
-featureText=UML2 Tools Documentation\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Borland Software Corporation and others. 2006. All rights reserved.\n\
-\n\
-UML2 Tools based on Eclipse UML2 and GMF projects.\n\
-Visit http://www.eclipse.org/modeling/uml2
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/doc/org.eclipse.uml2tools.doc/build.properties b/doc/org.eclipse.uml2tools.doc/build.properties
deleted file mode 100755
index 9c86577..0000000
--- a/doc/org.eclipse.uml2tools.doc/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-custom = true
diff --git a/doc/org.eclipse.uml2tools.doc/build.xml b/doc/org.eclipse.uml2tools.doc/build.xml
deleted file mode 100644
index 08d693c..0000000
--- a/doc/org.eclipse.uml2tools.doc/build.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.uml2tools.doc" default="build.jars" basedir=".">
-
- <!-- Plug-in version. This is a HACK. Do not forget to update. -->
- <property name="pluginVersion" value="0.7.0"/>
-
- <property name="plugin" value="org.eclipse.uml2tools"/>
- <property name="docPlugin" value="org.eclipse.uml2tools.doc"/>
-
- <property name="filesToInclude" value="META-INF/,about.*,modeling*.png,plugin.*,doc.zip,toc.xml,index/**"/>
-
- <!-- Compiler settings. -->
- <property name="javacFailOnError" value="false"/>
- <property name="javacDebugInfo" value="on"/>
- <property name="javacVerbose" value="true"/>
- <property name="javacSource" value="1.4"/>
- <property name="javacTarget" value="1.4"/>
- <property name="compilerArg" value=""/>
- <path id="path_bootclasspath">
- <fileset dir="${java.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
- <property name="bootclasspath" refid="path_bootclasspath"/>
-
- <property name="bundleJavacSource" value="${javacSource}"/>
- <property name="bundleJavacTarget" value="${javacTarget}"/>
- <property name="bundleBootClasspath" value="${bootclasspath}"/>
- <property name="basews" value="${ws}"/>
- <property name="baseos" value="${os}"/>
- <property name="basearch" value="${arch}"/>
- <property name="basenl" value="${nl}"/>
-
- <target name="init" depends="properties">
- <condition property="pluginTemp" value="${buildTempFolder}/plugins">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="pluginTemp" value="${basedir}"/>
- <condition property="build.result.folder" value="${pluginTemp}/${docPlugin}">
- <isset property="buildTempFolder"/>
- </condition>
- <property name="build.result.folder" value="${basedir}"/>
- <property name="temp.folder" value="${basedir}/temp.folder"/>
- <property name="plugin.destination" value="${basedir}"/>
- </target>
-
- <target name="properties" if="eclipse.running">
- <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
- </target>
-
- <target name="build.update.jar" depends="init" description="Build the plug-in: ${plugin} for an update site.">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <zip destfile="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.jar" basedir="${temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}" filesonly="false" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="build.jars" depends="init" description="Build all the jars for the plug-in: ${docPlugin}.">
- <!-- Execute a shell script that will create an ant javadoc script and then run it for us -->
- <exec executable="sh">
- <arg value="build/antJavadoc.sh"/>
- <arg value="${eclipse.home}/../eclipse"/>
- </exec>
-
- <antcall target="build.index"/>
-
- <!-- Zip up all of the documentation artifacts - references(including javadoc), images, tutorials, etc. -->
- <zip destfile="doc.zip" compress="true">
- <!-- Add new folders for documentation zip here. -->
- <zipfileset dir="references" prefix="references" excludes="**/impl,**/impl/**"/>
- </zip>
- </target>
-
- <target name="build.index" depends="init" description="Builds search index for the plug-in" if="eclipse.running">
- <help.buildHelpIndex manifest="plugin.xml" destination="."/>
- </target>
-
- <target name="build.sources" depends="init">
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <mkdir dir="${destination.temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}"/>
- <copy todir="${destination.temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}" failonerror="true" overwrite="false">
- <fileset dir="${basedir}" includes="${filesToInclude}"/>
- </copy>
- <eclipse.versionReplacer
- path="${destination.temp.folder}/${docPlugin}_${pluginVersion}.${forceContextQualifier}"
- version="${pluginVersion}.${forceContextQualifier}"/>
- </target>
-
- <target name="build.zips" depends="init">
- </target>
-
- <target name="gather.sources" depends="init" if="destination.temp.folder">
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
- </target>
-
- <target name="clean" depends="init" description="Clean the plug-in: ${docPlugin} of all the zips, jars and logs created.">
- <delete file="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.jar"/>
- <delete file="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.zip"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: ${docPlugin}.">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="build.sources"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <antcall target="gather.sources">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <delete>
- <fileset dir="${temp.folder}" includes="**/*.bin.log" />
- </delete>
- <zip destfile="${plugin.destination}/${docPlugin}_${pluginVersion}.${forceContextQualifier}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
-</project>
diff --git a/doc/org.eclipse.uml2tools.doc/build/antJavadoc.sh b/doc/org.eclipse.uml2tools.doc/build/antJavadoc.sh
deleted file mode 100644
index 2660872..0000000
--- a/doc/org.eclipse.uml2tools.doc/build/antJavadoc.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-
-# BEGIN CUSTOMIZATIONS
-
-# The plugin name
-pluginName="org.eclipse.uml2tools";
-
-# string labels for javadoc content
-windowTitle="UML2 Tools Javadoc";
-groupTitle="UML2 Tools";
-
-# files to exclude from javadoc process - use Ant syntax
-javadocExclusions="<exclude name=\"**/internal/**\"/> <exclude name=\"**/examples/**\"/> <exclude name=\"**/tests/**\"/>";
-
-# END CUSTOMIZATIONS
-
-##########################################################################
-
-debug=0; if [ $debug -gt 0 ]; then echo "[antJd] debug: "$debug; fi
-
-if [ "x"$ANT_HOME = "x" ]; then export ANT_HOME=/opt/apache-ant-1.6; fi
-if [ "x"$JAVA_HOME = "x" ]; then export JAVA_HOME=/opt/ibm-java2-1.4; fi
-export PATH=${PATH}:${ANT_HOME}/bin
-
-# current directory - all but the name of this script, no trailing slash
-currentPath=$PWD"/"$0; currentPath=${currentPath%/*}; if [ $debug -gt 0 ]; then echo "[antJd] currentPath: "$currentPath; fi
-
-# path to $buildID/eclipse/plugins, no trailing slash
-pluginPath=${currentPath%/$pluginName*}; if [ $debug -gt 0 ]; then echo "[antJd] pluginName: "$pluginName; echo "[antJd] pluginPath: "$pluginPath; fi
-
-# ant script to create and then execute
-antScript=$currentPath"/javadoc.xml"; if [ $debug -gt 0 ]; then echo "[antJd] antScript: "$antScript; fi
-
-# The eclipse directory
-eclipseDir=`cd $1; echo $PWD`; if [ $debug -gt 0 ]; then echo "[antJd] eclipseDir: "$eclipseDir; fi
-
-# The destination directory
-destDir=$currentPath/../references/javadoc; mkdir -p $destDir; destDir=`cd $destDir; echo $PWD`; # resolve relative path
-if [ $debug -gt 0 ]; then echo "[antJd] destDir: "$destDir; fi
-
-hasToken=`grep -c "@plugin@" $antScript".template"`;
-if [ $hasToken -gt 0 ]; then
- srcDir=$pluginPath/$pluginName/src; if [ $debug -gt 0 ]; then echo "[antJd] srcDir: "$srcDir; fi
- if [ -d "$srcDir" ]; then
- if [ `find $srcDir -name "*.java" | grep -c .` -eq 0 ]; then # must unpack zips first
- if [ $debug -gt 0 ]; then echo "[antJd] Unpacking *src.zip"; fi
- for f in `find $srcDir -name "*src.zip"`; do
- if [ $debug -gt 1 ]; then echo "[antJd] Unpack $f"; fi
- unzip -q -d $srcDir $f;
- done
- fi
- if [ $debug -gt 0 ]; then echo "[antJd] *.java in srcDir: "; echo "-----------------"; echo `find $srcDir -type f -name '*.java'`; echo "-----------------"; fi
- packages=`find $srcDir -type f -name '*.java' -exec grep -e '^package .*;' {} \; | sed -e 's/^package *\(.*\);/\1/' | sed -e 's/[ ]*//g' | dos2unix | sort | uniq | xargs | sed -e 's/ /:/g'`;
- if [ $debug -gt 1 ]; then echo "[antJd] packages1: "$packages; fi
- packages=`echo $packages | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`; # slash escape
- if [ $debug -gt 1 ]; then echo "[antJd] packages2: "$packages; fi
- sed -e "s/\@plugin\@/${packages}/g" $antScript.template > $antScript.template.tmp;
- else
- echo "[antJd] ERROR! "$srcDir" does not exist!";
- exit 1;
- fi
-else
- echo "[antJd] ERROR! "$currentPath"/javadoc.xml.template does not contain token @plugin@!";
- exit 1;
-fi
-
-# Finds plugins in the Workspace:
-pluginDirs=`find $pluginPath -name "${pluginName}*" -maxdepth 1 -type d -printf '%T@ %p\n' | sort -n | cut -f2 -d' '`;
-if [ $debug -gt 0 ]; then
- echo "[antJd] pluginDirs:";
- for pluginDir in $pluginDirs; do echo "[antJd] "$pluginDir; done
-fi
-
-### TODO?: missing emf/sdo/xsd plugins in $eclipseDir - need to copy them over or reference source so that all classes/packages (and thus @links) can be resolved
-
-# All the jars in the plugins directory
-classpath="."`find $eclipseDir/plugins -name "*.jar" -printf ":%p"`; if [ $debug -gt 0 ]; then echo "[antJd] classpath: "$classpath; fi
-
-# Calculates the packagesets and the calls to copyDocFiles
-packagesets="";
-copydocfiles="";
-for pluginDir in $pluginDirs; do
- pluginDir=`echo $pluginDir | sed -e 's/\/runtime$//g'`;
- srcDir=$pluginDir/src;
- if [ $debug -gt 0 ]; then echo "[antJd] srcDir: "$srcDir; fi
- if [ -d "$srcDir" ]; then
- # define what to include when javadoc'ing here:
- packagesets=$packagesets"<packageset dir=\"$srcDir\"> ";
- packagesets=$packagesets"<exclude name=\"$srcDir/**/doc-files/**\"/> ";
- packagesets=$packagesets""$javadocExclusions;
- packagesets=$packagesets"</packageset>";
- copydocfiles=$copydocfiles"<copyDocFiles pluginDir=\"$pluginDir\"/>";
- fi
-done
-if [ $debug -gt 0 ]; then
- echo "[antJd] packagesets:"; echo $packagesets;
- echo "[antJd] copydocfiles:"; echo $copydocfiles;
-fi
-
-# Finds the proper org.eclipse.platform.doc.isv jar
-docjar=`find $eclipseDir/plugins/ -name "org.eclipse.platform.doc.isv*.jar" -printf "%f"`; if [ $debug -gt 1 ]; then echo "[antJd] docjar: "$docjar; fi
-
-if [ -f $antScript.template ]; then
- true;
-else
- cp $antScript.template $antScript.template.tmp;
-fi
-
-# do replacements in template
-if [ $debug -gt 1 ]; then echo "[antJd] Replace @packagesets@ in the template ..."; fi
-packagesets=`echo $packagesets | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`;
-sed -e "s/\@packagesets\@/${packagesets}/g" $antScript.template.tmp > $antScript.template.tmp2;
-
-if [ $debug -gt 1 ]; then echo "[antJd] Replace @copydocfiles@ in the template ..."; fi
-copydocfiles=`echo $copydocfiles | sed -e 's/\//\\\\\\//g' | sed -e 's/\./\\\\\./g'`;
-sed -e "s/\@copydocfiles\@/${copydocfiles}/g" $antScript.template.tmp2 > $antScript;
-
-#run ant to do javadoc build
-ant -f $antScript \
- -DdestDir="$destDir" \
- -Dclasspath="$classpath" \
- -DeclipseDir="$eclipseDir" \
- -Ddocjar="$docjar" \
- -DwindowTitle="$windowTitle" \
- -DgroupTitle="$groupTitle" \
- -Doverview="$currentPath/overview.html";
-
-# Clean up templates
-rm -f $antScript $antScript.template.tmp $antScript.template.tmp2;
-
-# Generate topics_Reference.xml (replacement for doclet).
-trXML=$currentPath"/../topics_Reference.xml";
-echo '<?xml version="1.0" encoding="UTF-8"?>' >> $trXML;
-echo '<?NLS TYPE="org.eclipse.help.toc"?>' >> $trXML;
-echo '<toc label="Reference">' >> $trXML;
-echo ' <topic label="API Reference" href="references/javadoc/overview-summary.html">' >> $trXML;
-for packSum in `find $destDir -name "package-summary.html" | sort`; do
- path=${packSum%/package-summary.html}; path=${path#$destDir/}; # org/eclipse/xsd/ecore/importer/taskdefs
- label=${path//\//.}; # org.eclipse.xsd.ecore.importer.taskdefs
- echo ' <topic label="'$label'" href="references/javadoc/'$path'/package-summary.html" />' >> $trXML;
-done
-echo ' </topic>' >> $trXML;
-echo '</toc>' >> $trXML;
\ No newline at end of file
diff --git a/doc/org.eclipse.uml2tools.doc/build/javadoc.xml.template b/doc/org.eclipse.uml2tools.doc/build/javadoc.xml.template
deleted file mode 100644
index e90d31a..0000000
--- a/doc/org.eclipse.uml2tools.doc/build/javadoc.xml.template
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Plugin Javadoc" default="javadoc">
- <property name="destDir" value="doc"/>
- <property name="classpath" value="bin"/>
- <property name="overview" value="build/overview.html"/>
- <property name="eclipseDir" value="."/>
- <property name="docjar" value="org.eclipse.platform.doc.isv.jar"/>
-
- <!-- other properties that must be passed to this script include:
- windowTitle
- groupTitle
- -->
-
- <property environment="env"/>
- <property name="javaHome" value="${env.JAVA_HOME}"/>
-
- <property name="javadoc.link.location" value="${eclipseDir}/javadoc"/>
- <available property="platformJavadocExists" file="${javadoc.link.location}/platform/"/>
-
- <!-- TODO Enable linking to the platform javadoc -->
- <!-- <target name="extractPlatformJavadoc" unless="platformJavadocExists">
- <exec executable="find">
- <arg value="${eclipseDir}/.."/>
- <arg value="-type"/>
- <arg value="d"/>
- <arg value="-name"/>
- <arg value="javadoc"/>
- </exec>
- <unzip src="${eclipseDir}/@docjar@" dest="${javadoc.link.location}/platform/"/>
- </target> -->
-
- <!-- TODO Enable linking to the platform javadoc -->
- <!-- <target name="javadoc" depends="extractPlatformJavadoc"> -->
-
- <target name="javadoc">
- <javadoc
- destdir="${destDir}"
- classpath="${classpath}"
- overview="${overview}"
-
- windowtitle="${windowTitle}"
- footer="Copyright 2006 IBM Corporation and others.<br> All Rights Reserved."
-
- access="protected"
- additionalparam="-breakiterator -tag model:X -tag generated:X -tag ordered:X"
- author="false"
- breakiterator="true"
- charset="UTF-8"
- docencoding="UTF-8"
- nodeprecated="false"
- nodeprecatedlist="false"
- noindex="false"
- nonavbar="false"
- notree="false"
- source="1.4"
- splitindex="true"
- use="true"
- version="true">
- <arg value="-J-Xmx180m"/>
-
- <link offline="true" href="http://java.sun.com/j2se/1.4/docs/api/" packagelistLoc="${javaHome}/docs/api/"/>
- <!-- TODO Enable link to platform documentation -->
- <!-- <link offline="true" href="/help/topic/org.eclipse.platform.doc.isv/reference/api/" packagelistLoc="${javadoc.link.location}/platform/reference/api/"/> -->
-
- <tag name="ignore" description="ignore" enabled="false"/>
- <tag name="generated" description="ignore" enabled="false"/>
- <tag name="model" description="ignore" enabled="false"/>
- <tag name="modifiable" description="ignore" enabled="false"/>
- <tag name="extends" description="ignore" enabled="false"/>
- <tag name="implements" description="ignore" enabled="false"/>
- <tag name="ordered" description="ignore" enabled="false"/>
-
- <!-- If you add a @ plugin @ below, don't forget to update the antjavadoc.sh file -->
-
- <group title="${groupTitle}" packages="@plugin@"/>
-
- <!-- If you add a @ plugin @ above, don't forget to update the antjavadoc.sh file -->
-
- @packagesets@
-
- </javadoc>
-
- <!-- make sure the doc-files are copied -->
- <macrodef name="copyDocFiles">
- <attribute name="pluginDir"/>
- <sequential>
- <copy todir="${destDir}" failonerror="false">
- <fileset dir="@{pluginDir}/src" includes="**/doc-files/**"/>
- </copy>
- </sequential>
- </macrodef>
-
- @copydocfiles@
-
- </target>
-</project>
\ No newline at end of file
diff --git a/doc/org.eclipse.uml2tools.doc/build/overview.html b/doc/org.eclipse.uml2tools.doc/build/overview.html
deleted file mode 100644
index 38ac1d5..0000000
--- a/doc/org.eclipse.uml2tools.doc/build/overview.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<!--
-/**
- * <copyright>
- *
- * Copyright (c) 2006 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>
- *
- * $Id: overview.html,v 1.1 2006/12/23 06:41:36 nickb Exp $
- */
--->
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-</head>
-<body bgcolor="white">
-
-</body>
-</html>
diff --git a/doc/org.eclipse.uml2tools.doc/modeling32.png b/doc/org.eclipse.uml2tools.doc/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/doc/org.eclipse.uml2tools.doc/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/doc/org.eclipse.uml2tools.doc/plugin.properties b/doc/org.eclipse.uml2tools.doc/plugin.properties
deleted file mode 100755
index d605e2f..0000000
--- a/doc/org.eclipse.uml2tools.doc/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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=UML2 Tools Documentation Plug-in
-providerName=Eclipse.org
diff --git a/doc/org.eclipse.uml2tools.doc/plugin.xml b/doc/org.eclipse.uml2tools.doc/plugin.xml
deleted file mode 100755
index 491dd33..0000000
--- a/doc/org.eclipse.uml2tools.doc/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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:
- Michael Golubev (Borland) - initial API and implementation
--->
-<plugin>
- <extension
- point="org.eclipse.help.toc">
- <toc file="toc.xml" primary="true"/>
- <index path="index"/>
- </extension>
-</plugin>
diff --git a/doc/org.eclipse.uml2tools.doc/references/.cvsignore b/doc/org.eclipse.uml2tools.doc/references/.cvsignore
deleted file mode 100644
index e69de29..0000000
--- a/doc/org.eclipse.uml2tools.doc/references/.cvsignore
+++ /dev/null
diff --git a/doc/org.eclipse.uml2tools.doc/references/uml2tools-doc.xhtml b/doc/org.eclipse.uml2tools.doc/references/uml2tools-doc.xhtml
deleted file mode 100644
index a8c2e8d..0000000
--- a/doc/org.eclipse.uml2tools.doc/references/uml2tools-doc.xhtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-<title>UML2 Tools Documentation</title>
-<style type="text/css">
-/*<![CDATA[*/
-<!--
- /* Style Definitions */
-h1
- {margin-top:17.0pt;
- margin-right:0cm;
- margin-bottom:16.5pt;
- margin-left:0cm;
- text-align:justify;
- text-justify:inter-ideograph;
- line-height:240%;
- page-break-after:avoid;
- font-size:22.0pt;
- font-family:"Times New Roman";}
-div.Section1
- {page:Section1;}
--->
-/*]]>*/
-</style>
-
-</head>
-<body>
-<div class="Section1" style='layout-grid:15.6pt'>
-<h1 align="center" style='text-align:center'><span lang="EN-US"
-xml:lang="EN-US">UML2 Tools Documentation<br/>TBD</span></h1>
-</div>
-</body>
-</html>
diff --git a/doc/org.eclipse.uml2tools.doc/toc.xml b/doc/org.eclipse.uml2tools.doc/toc.xml
deleted file mode 100644
index f228813..0000000
--- a/doc/org.eclipse.uml2tools.doc/toc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="UML2 Tools Table of Contents">
- <!--topic label="Javadoc" href="references/javadoc/index.html"/-->
-</toc>
diff --git a/examples/org.eclipse.uml2.diagram.examples.clazz/META-INF/MANIFEST.MF b/examples/org.eclipse.uml2.diagram.examples.clazz/META-INF/MANIFEST.MF
index 6c74f3c..9c0049e 100644
--- a/examples/org.eclipse.uml2.diagram.examples.clazz/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.uml2.diagram.examples.clazz/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.uml2.diagram.examples.clazz;singleton:=true
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.7.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/examples/org.eclipse.uml2.diagram.examples.profile/.cvsignore b/examples/org.eclipse.uml2.diagram.examples.profile/.cvsignore
deleted file mode 100644
index 5e83119..0000000
--- a/examples/org.eclipse.uml2.diagram.examples.profile/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.settings
diff --git a/examples/org.eclipse.uml2.diagram.examples.profile/.project b/examples/org.eclipse.uml2.diagram.examples.profile/.project
deleted file mode 100644
index 0961162..0000000
--- a/examples/org.eclipse.uml2.diagram.examples.profile/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.examples.profile</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/examples/org.eclipse.uml2.diagram.examples.profile/META-INF/MANIFEST.MF b/examples/org.eclipse.uml2.diagram.examples.profile/META-INF/MANIFEST.MF
deleted file mode 100644
index 604698e..0000000
--- a/examples/org.eclipse.uml2.diagram.examples.profile/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.examples.profile;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
diff --git a/examples/org.eclipse.uml2.diagram.examples.profile/about.html b/examples/org.eclipse.uml2.diagram.examples.profile/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/examples/org.eclipse.uml2.diagram.examples.profile/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/examples/org.eclipse.uml2.diagram.examples.profile/build.properties b/examples/org.eclipse.uml2.diagram.examples.profile/build.properties
deleted file mode 100644
index 1d3e9b2..0000000
--- a/examples/org.eclipse.uml2.diagram.examples.profile/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = META-INF/,\
- diagram/,\
- plugin.xml,\
- plugin.properties,\
- about.html
-src.includes = diagram/,\
- about.html
diff --git a/examples/org.eclipse.uml2.diagram.examples.profile/diagram/IntroductionToUML2Profiles/Ecore.profile.uml b/examples/org.eclipse.uml2.diagram.examples.profile/diagram/IntroductionToUML2Profiles/Ecore.profile.uml
deleted file mode 100644
index 5b673d2..0000000
--- a/examples/org.eclipse.uml2.diagram.examples.profile/diagram/IntroductionToUML2Profiles/Ecore.profile.uml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Profile xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" xmi:id="_C0xFYH_OEdufhfJBSJdKEg" metaclassReference="_5lluIH_PEdufhfJBSJdKEg">
- <elementImport xmi:id="_C0xFYX_OEdufhfJBSJdKEg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_C0xFYn_OEdufhfJBSJdKEg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_C0xFY3_OEdufhfJBSJdKEg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_C0xFZH_OEdufhfJBSJdKEg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <elementImport xmi:id="_5lluIH_PEdufhfJBSJdKEg">
- <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- </elementImport>
- <packagedElement xmi:type="uml:Enumeration" xmi:id="_IJJwIH_OEdufhfJBSJdKEg" name="VisibilityKind">
- <ownedLiteral xmi:id="_QVeRUH_OEdufhfJBSJdKEg" name="Unspecified"/>
- <ownedLiteral xmi:id="_UJA0YH_OEdufhfJBSJdKEg" name="None"/>
- <ownedLiteral xmi:id="_VJSloH_OEdufhfJBSJdKEg" name="ReadOnly"/>
- <ownedLiteral xmi:id="_VtMj8H_OEdufhfJBSJdKEg" name="ReadWrite"/>
- <ownedLiteral xmi:id="_V42aUH_OEdufhfJBSJdKEg" name="ReadOnlyUnsettable"/>
- <ownedLiteral xmi:id="_WMDDIH_OEdufhfJBSJdKEg" name="ReadWriteUnsettable"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Enumeration" xmi:id="_lx5WoH_OEdufhfJBSJdKEg" name="FeatureKind">
- <ownedLiteral xmi:id="_nq5foH_OEdufhfJBSJdKEg" name="Unspecified"/>
- <ownedLiteral xmi:id="_roXawH_OEdufhfJBSJdKEg" name="Simple"/>
- <ownedLiteral xmi:id="_r2sxsH_OEdufhfJBSJdKEg" name="Attribute"/>
- <ownedLiteral xmi:id="_sAPvQH_OEdufhfJBSJdKEg" name="Element"/>
- <ownedLiteral xmi:id="_sKeCQH_OEdufhfJBSJdKEg" name="AttributeWildcard"/>
- <ownedLiteral xmi:id="_0py_AH_OEdufhfJBSJdKEg" name="ElementWildcard"/>
- <ownedLiteral xmi:id="_1HgOsH_OEdufhfJBSJdKEg" name="Group"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Stereotype" xmi:id="_8pI0IH_OEdufhfJBSJdKEg" name="EStructuralFeature">
- <ownedAttribute xmi:id="_Rrw5YH_PEdufhfJBSJdKEg" name="isTransient">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dDhb0H_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dDhb0X_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_R7btEH_PEdufhfJBSJdKEg" name="isVolatile">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_atexgH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_atexgX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_SD1bIH_PEdufhfJBSJdKEg" name="isUnsettable">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fIp8UH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fIp8UX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_SLqhcH_PEdufhfJBSJdKEg" name="xmlNamespace">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gvCEQH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gvCEQX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_SSKLAH_PEdufhfJBSJdKEg" name="xmlFeatureKind" type="_lx5WoH_OEdufhfJBSJdKEg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jWXS4H_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jWXS4X_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_mbM84H_PEdufhfJBSJdKEg" name="visibility" type="_IJJwIH_OEdufhfJBSJdKEg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mtPvIH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mtPvIX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Stereotype" xmi:id="_AB11UH_PEdufhfJBSJdKEg" name="EAttribute">
- <generalization xmi:id="_C_mm8H_PEdufhfJBSJdKEg" general="_8pI0IH_OEdufhfJBSJdKEg"/>
- <ownedAttribute xmi:id="_uJooMH_PEdufhfJBSJdKEg" name="attributeName">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uWDTkH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uWDTkX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_wd80MH_PEdufhfJBSJdKEg" name="isID">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wtz1IH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wtz1IX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_A4_qUH_QEdufhfJBSJdKEg" name="base_Property" association="_A45jsH_QEdufhfJBSJdKEg">
- <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Extension" xmi:id="_A45jsH_QEdufhfJBSJdKEg" name="Property_EAttribute" memberEnd="_A45jsX_QEdufhfJBSJdKEg _A4_qUH_QEdufhfJBSJdKEg">
- <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_A45jsX_QEdufhfJBSJdKEg" name="extension_EAttribute" type="_AB11UH_PEdufhfJBSJdKEg" aggregation="composite" association="_A45jsH_QEdufhfJBSJdKEg"/>
- </packagedElement>
-</uml:Profile>
diff --git a/examples/org.eclipse.uml2.diagram.examples.profile/diagram/IntroductionToUML2Profiles/Ecore.umlprofile_diagram b/examples/org.eclipse.uml2.diagram.examples.profile/diagram/IntroductionToUML2Profiles/Ecore.umlprofile_diagram
deleted file mode 100644
index 0f990ef..0000000
--- a/examples/org.eclipse.uml2.diagram.examples.profile/diagram/IntroductionToUML2Profiles/Ecore.umlprofile_diagram
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.0/notation" xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" xmi:id="_C0xFZX_OEdufhfJBSJdKEg" type="UMLProfile" name="Ecore.umlprofile_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_IMZRYH_OEdufhfJBSJdKEg" type="2003">
- <children xmi:type="notation:Node" xmi:id="_IMZRZn_OEdufhfJBSJdKEg" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_IMZRZ3_OEdufhfJBSJdKEg" type="7004">
- <children xmi:type="notation:Node" xmi:id="_QWC5EH_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_QVeRUH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QWC5EX_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_UJfVgH_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_UJA0YH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UJfVgX_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_VKJhQH_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_VJSloH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_VKJhQX_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_VtMj8X_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_VtMj8H_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_VtMj8n_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_V5O00H_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_V42aUH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_V5O00X_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_WMPQYH_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_WMDDIH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_WMPQYX_OEdufhfJBSJdKEg"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_IMZRaH_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IMZRaX_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IMZRan_OEdufhfJBSJdKEg"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_IMZRYX_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_IMZRYn_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_IMZRY3_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_IMZRZH_OEdufhfJBSJdKEg"/>
- <element xmi:type="uml:Enumeration" href="Ecore.profile.uml#_IJJwIH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IMZRZX_OEdufhfJBSJdKEg" x="48" y="36"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_lyRxIH_OEdufhfJBSJdKEg" type="2003">
- <children xmi:type="notation:Node" xmi:id="_lyRxJn_OEdufhfJBSJdKEg" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_lyRxJ3_OEdufhfJBSJdKEg" type="7004">
- <children xmi:type="notation:Node" xmi:id="_nrLzgH_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_nq5foH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nrLzgX_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_rojoAH_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_roXawH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_rojoAX_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_r2y4UH_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_r2sxsH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_r2y4UX_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_sA0XAH_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_sAPvQH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_sA0XAX_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_sKkI4H_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_sKeCQH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_sKkI4X_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_0qFS4H_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_0py_AH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_0qFS4X_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_1H4pMH_OEdufhfJBSJdKEg" type="3005">
- <element xmi:type="uml:EnumerationLiteral" href="Ecore.profile.uml#_1HgOsH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_1H4pMX_OEdufhfJBSJdKEg"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_lyRxKH_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_lyRxKX_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_lyRxKn_OEdufhfJBSJdKEg"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_lyRxIX_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_lyRxIn_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_lyRxI3_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_lyRxJH_OEdufhfJBSJdKEg"/>
- <element xmi:type="uml:Enumeration" href="Ecore.profile.uml#_lx5WoH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lyRxJX_OEdufhfJBSJdKEg" x="60" y="204"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8pnVQH_OEdufhfJBSJdKEg" type="2001">
- <children xmi:type="notation:Node" xmi:id="_8pnVRn_OEdufhfJBSJdKEg" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_8pnVR3_OEdufhfJBSJdKEg" type="7001">
- <children xmi:type="notation:Node" xmi:id="_RsDNQH_PEdufhfJBSJdKEg" type="3001">
- <element xmi:type="uml:Property" href="Ecore.profile.uml#_Rrw5YH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_RsDNQX_PEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_R7uA8H_PEdufhfJBSJdKEg" type="3001">
- <element xmi:type="uml:Property" href="Ecore.profile.uml#_R7btEH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_R7uA8X_PEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_SD7hwH_PEdufhfJBSJdKEg" type="3001">
- <element xmi:type="uml:Property" href="Ecore.profile.uml#_SD1bIH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_SD7hwX_PEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_SLwoEH_PEdufhfJBSJdKEg" type="3001">
- <element xmi:type="uml:Property" href="Ecore.profile.uml#_SLqhcH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_SLwoEX_PEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_SSce4H_PEdufhfJBSJdKEg" type="3001">
- <element xmi:type="uml:Property" href="Ecore.profile.uml#_SSKLAH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_SSce4X_PEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mc0tgH_PEdufhfJBSJdKEg" type="3001">
- <element xmi:type="uml:Property" href="Ecore.profile.uml#_mbM84H_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_mc0tgX_PEdufhfJBSJdKEg"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_8pnVSH_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_8pnVSX_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_8pnVSn_OEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8pnVS3_OEdufhfJBSJdKEg" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_8pnVTH_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_8pnVTX_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_8pnVTn_OEdufhfJBSJdKEg"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_8pnVQX_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_8pnVQn_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_8pnVQ3_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_8pnVRH_OEdufhfJBSJdKEg"/>
- <element xmi:type="uml:Stereotype" href="Ecore.profile.uml#_8pI0IH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8pnVRX_OEdufhfJBSJdKEg" x="288" y="36"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_ACUWcH_PEdufhfJBSJdKEg" type="2001">
- <children xmi:type="notation:Node" xmi:id="_ACUWdn_PEdufhfJBSJdKEg" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_ACUWd3_PEdufhfJBSJdKEg" type="7001">
- <children xmi:type="notation:Node" xmi:id="_uJ68EH_PEdufhfJBSJdKEg" type="3001">
- <element xmi:type="uml:Property" href="Ecore.profile.uml#_uJooMH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_uJ68EX_PEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_weVOsH_PEdufhfJBSJdKEg" type="3001">
- <element xmi:type="uml:Property" href="Ecore.profile.uml#_wd80MH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_weVOsX_PEdufhfJBSJdKEg"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_ACUWeH_PEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ACUWeX_PEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ACUWen_PEdufhfJBSJdKEg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_ACUWe3_PEdufhfJBSJdKEg" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_ACUWfH_PEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_ACUWfX_PEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ACUWfn_PEdufhfJBSJdKEg"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_ACUWcX_PEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_ACUWcn_PEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_ACUWc3_PEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_ACUWdH_PEdufhfJBSJdKEg"/>
- <element xmi:type="uml:Stereotype" href="Ecore.profile.uml#_AB11UH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ACUWdX_PEdufhfJBSJdKEg" x="312" y="312"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_5lr0wH_PEdufhfJBSJdKEg" type="2006">
- <children xmi:type="notation:Node" xmi:id="_5mEPQH_PEdufhfJBSJdKEg" type="5008"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_5lr0wX_PEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_5lr0wn_PEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_5lr0w3_PEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_5lr0xH_PEdufhfJBSJdKEg"/>
- <element xmi:type="uml:ElementImport" href="Ecore.profile.uml#_5lluIH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5lr0xX_PEdufhfJBSJdKEg" x="612" y="192"/>
- </children>
- <styles xmi:type="notation:PageStyle" xmi:id="_C0xFZn_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:GuideStyle" xmi:id="_C0xFZ3_OEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_C0xFaH_OEdufhfJBSJdKEg"/>
- <element xmi:type="uml:Profile" href="Ecore.profile.uml#_C0xFYH_OEdufhfJBSJdKEg"/>
- <edges xmi:type="notation:Edge" xmi:id="_A6hUUH_QEdufhfJBSJdKEg" type="4002" source="_ACUWcH_PEdufhfJBSJdKEg" target="_5lr0wH_PEdufhfJBSJdKEg">
- <styles xmi:type="notation:RoutingStyle" xmi:id="_A6hUUX_QEdufhfJBSJdKEg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_A6hUUn_QEdufhfJBSJdKEg"/>
- <element xmi:type="uml:Extension" href="Ecore.profile.uml#_A45jsH_QEdufhfJBSJdKEg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_A6hUU3_QEdufhfJBSJdKEg" points="[29, -6, -122, 0]$[146, -12, -5, -6]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BA63QH_QEdufhfJBSJdKEg" id="(0.83798885,0.12244898)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_BA63QX_QEdufhfJBSJdKEg" id="(0.32894737,0.13953489)"/>
- </edges>
-</notation:Diagram>
diff --git a/examples/org.eclipse.uml2.diagram.examples.profile/plugin.properties b/examples/org.eclipse.uml2.diagram.examples.profile/plugin.properties
deleted file mode 100644
index 84430fd..0000000
--- a/examples/org.eclipse.uml2.diagram.examples.profile/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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=UML2 Profile Definition Diagram Samples Plug-in (Incubation)
-providerName=Eclipse.org
diff --git a/examples/org.eclipse.uml2.diagram.examples.profile/plugin.xml b/examples/org.eclipse.uml2.diagram.examples.profile/plugin.xml
deleted file mode 100644
index fe9c6cc..0000000
--- a/examples/org.eclipse.uml2.diagram.examples.profile/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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:
- Michael Golubev (Borland) - initial API and implementation
--->
-
-<plugin>
-</plugin>
diff --git a/examples/org.eclipse.uml2tools.examples-feature/.project b/examples/org.eclipse.uml2tools.examples-feature/.project
deleted file mode 100644
index 08661dc..0000000
--- a/examples/org.eclipse.uml2tools.examples-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2tools.examples-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/examples/org.eclipse.uml2tools.examples-feature/build.properties b/examples/org.eclipse.uml2tools.examples-feature/build.properties
deleted file mode 100644
index 07a1b14..0000000
--- a/examples/org.eclipse.uml2tools.examples-feature/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- copyright.txt,\
- license.html
-src.includes = epl-v10.html,\
- license.html
-root=rootfiles
diff --git a/examples/org.eclipse.uml2tools.examples-feature/copyright.txt b/examples/org.eclipse.uml2tools.examples-feature/copyright.txt
deleted file mode 100644
index 29ad511..0000000
--- a/examples/org.eclipse.uml2tools.examples-feature/copyright.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (c) 2006, 2007 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:
- Michael Golubev (Borland) - initial API and implementation
diff --git a/examples/org.eclipse.uml2tools.examples-feature/eclipse_update_120.jpg b/examples/org.eclipse.uml2tools.examples-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/examples/org.eclipse.uml2tools.examples-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/examples/org.eclipse.uml2tools.examples-feature/epl-v10.html b/examples/org.eclipse.uml2tools.examples-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/examples/org.eclipse.uml2tools.examples-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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "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. 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]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/examples/org.eclipse.uml2tools.examples-feature/feature.properties b/examples/org.eclipse.uml2tools.examples-feature/feature.properties
deleted file mode 100644
index dcd1959..0000000
--- a/examples/org.eclipse.uml2tools.examples-feature/feature.properties
+++ /dev/null
@@ -1,123 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 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
-###############################################################################
-
-featureName=UML2 Diagramming Samples (Incubation)
-providerName=Eclipse.org
-updateSiteName=Model Development Tools (MDT) updates
-description=UML2 Diagramming Samples
-copyrightURL=copyright.txt
-copyright=Copyright (c) 2006, 2007 Borland Software Corporation \n\
-All rights reserved. This program and the accompanying materials \n\
-are made available under the terms of the Eclipse Public License v1.0 \n\
-which accompanies this distribution, and is available at \n\
-http://www.eclipse.org/legal/epl-v10.html \n\
- \n\
-Contributors: \n\
- Michael Golubev (Borland) - initial API and implementation
-
-licenseURL=license.html
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
- - 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\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
diff --git a/examples/org.eclipse.uml2tools.examples-feature/feature.xml b/examples/org.eclipse.uml2tools.examples-feature/feature.xml
deleted file mode 100644
index 2f226e0..0000000
--- a/examples/org.eclipse.uml2tools.examples-feature/feature.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.uml2tools.examples"
- label="%featureName"
- version="0.8.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/modeling/mdt/updates/"/>
- </url>
-
- <plugin
- id="org.eclipse.uml2.diagram.examples.profile"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.uml2.diagram.examples.clazz"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-</feature>
diff --git a/examples/org.eclipse.uml2tools.examples-feature/license.html b/examples/org.eclipse.uml2tools.examples-feature/license.html
deleted file mode 100644
index a9b560f..0000000
--- a/examples/org.eclipse.uml2tools.examples-feature/license.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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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/examples/org.eclipse.uml2tools.examples-feature/rootfiles/epl-v10.html b/examples/org.eclipse.uml2tools.examples-feature/rootfiles/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/examples/org.eclipse.uml2tools.examples-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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "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. 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]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/examples/org.eclipse.uml2tools.examples-feature/rootfiles/notice.html b/examples/org.eclipse.uml2tools.examples-feature/rootfiles/notice.html
deleted file mode 100644
index a9b560f..0000000
--- a/examples/org.eclipse.uml2tools.examples-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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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/plugins/org.eclipse.uml2.diagram.activity/plugin.properties b/plugins/org.eclipse.uml2.diagram.activity/plugin.properties
index e3b6a95..c1455a7 100644
--- a/plugins/org.eclipse.uml2.diagram.activity/plugin.properties
+++ b/plugins/org.eclipse.uml2.diagram.activity/plugin.properties
@@ -8,7 +8,7 @@
# Contributors:
# Borland Software Corporation - initial API and implementation
###############################################################################
-pluginName=UML2 Activity Diagram Plugin (Incubation)
+pluginName=Activity Diagram Plugin (Incubation)
providerName=Eclipse.org
preferences.general=UMLActivity Diagram
@@ -24,14 +24,14 @@
newWizardName=UMLActivity Diagram
newWizardDesc=Creates UMLActivity diagram.
-initDiagramActionLabel=Initialize Activity Diagram
+initDiagramActionLabel=Initialize umlactivity_diagram diagram file
loadResourceActionLabel=Load Resource...
-navigatorContentName=Activity Diagram contents
+navigatorContentName=*.umlactivity_diagram diagram contents
domainNavigatorContentName=*.uml model contents
update.diagram.name=Update UMLActivity diagram
-update.diagram.description=Perform diagram update
+update.diagram.description=Perform UMLActivity diagram update
# Property Sheet
diff --git a/plugins/org.eclipse.uml2.diagram.clazz/plugin.properties b/plugins/org.eclipse.uml2.diagram.clazz/plugin.properties
index df096d1..f13ac31 100644
--- a/plugins/org.eclipse.uml2.diagram.clazz/plugin.properties
+++ b/plugins/org.eclipse.uml2.diagram.clazz/plugin.properties
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/.classpath b/plugins/org.eclipse.uml2.diagram.codegen.edit/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.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.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/.cvsignore b/plugins/org.eclipse.uml2.diagram.codegen.edit/.cvsignore
deleted file mode 100644
index d8bab97..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-.settings
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/.project b/plugins/org.eclipse.uml2.diagram.codegen.edit/.project
deleted file mode 100644
index cd070ef..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.codegen.edit</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.diagram.codegen.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index f2d5627..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.codegen.edit; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.uml2.diagram.codegen.gmfgenext.provider.GMFGenExtEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.uml2.diagram.codegen.gmfgenext.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.uml2.diagram.codegen;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.codegen.ecore;visibility:=reexport,
- org.eclipse.emf.codegen.ecore.ui;visibility:=reexport,
- org.eclipse.gmf.codegen;visibility:=reexport,
- org.eclipse.gmf.codegen.edit;visibility:=reexport
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/about.html b/plugins/org.eclipse.uml2.diagram.codegen.edit/about.html
deleted file mode 100644
index d35d5ae..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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>
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/build.properties b/plugins/org.eclipse.uml2.diagram.codegen.edit/build.properties
deleted file mode 100644
index ac9e11b..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id: build.properties,v 1.4 2008/06/03 17:00:08 tfesenko Exp $
-
-bin.includes = .,\
- icons/,\
- META-INF/,\
- plugin.xml,\
- plugin.properties,\
- about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_AuxSecondaryDiagramNodeAttribute.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_AuxSecondaryDiagramNodeAttribute.gif
deleted file mode 100644
index 9a7f5b8..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_AuxSecondaryDiagramNodeAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_CustomLocatorAttributes.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_CustomLocatorAttributes.gif
deleted file mode 100644
index 8d19645..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_CustomLocatorAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_DetailsLevelAttributes.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_DetailsLevelAttributes.gif
deleted file mode 100644
index 2243f6a..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_DetailsLevelAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_DynamicCanonicalCompartment.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_DynamicCanonicalCompartment.gif
deleted file mode 100644
index ac6a8a2..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_DynamicCanonicalCompartment.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_InteractionDiagramAttributes.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_InteractionDiagramAttributes.gif
deleted file mode 100644
index ecce8cb..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_InteractionDiagramAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_SubstitutableByAttributes.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_SubstitutableByAttributes.gif
deleted file mode 100644
index 3473a1f..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/ctool16/CreateViewmap_attributes_SubstitutableByAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/AuxSecondaryDiagramNodeAttribute.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/AuxSecondaryDiagramNodeAttribute.gif
deleted file mode 100644
index e4b530e..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/AuxSecondaryDiagramNodeAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/CustomLocatorAttributes.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/CustomLocatorAttributes.gif
deleted file mode 100644
index 7c2aaac..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/CustomLocatorAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/DetailsLevelAttributes.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/DetailsLevelAttributes.gif
deleted file mode 100644
index cb1755a..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/DetailsLevelAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/DynamicCanonicalCompartment.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/DynamicCanonicalCompartment.gif
deleted file mode 100644
index e4bc22d..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/DynamicCanonicalCompartment.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/InteractionDiagramAttributes.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/InteractionDiagramAttributes.gif
deleted file mode 100644
index 90d10f9..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/InteractionDiagramAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/SubstitutableByAttributes.gif b/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/SubstitutableByAttributes.gif
deleted file mode 100644
index c673a52..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/icons/full/obj16/SubstitutableByAttributes.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/plugin.properties b/plugins/org.eclipse.uml2.diagram.codegen.edit/plugin.properties
deleted file mode 100644
index cd5062d..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/plugin.properties
+++ /dev/null
@@ -1,52 +0,0 @@
-# <copyright>
-# </copyright>
-#
-# $Id: plugin.properties,v 1.7 2008/05/07 17:42:34 mgolubev 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 = UML2Tools Generation Helpers Edit (Incubation)
-providerName = Eclipse.org
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_AuxSecondaryDiagramNodeAttribute_type = Aux Secondary Diagram Node Attribute
-_UI_Unknown_type = Object
-
-_UI_Unknown_datatype= Value
-
-_UI_AuxSecondaryDiagramNodeAttribute_substituteWithCanvasElement_feature = Substitute With Canvas Element
-_UI_Unknown_feature = Unspecified
-
-_UI_CustomLocatorAttributes_type = Custom Locator Attributes
-_UI_CustomLocatorAttributes_customLocatorFQN_feature = Custom Locator FQN
-_UI_DetailsLevelAttributes_type = Details Level Attributes
-_UI_SubstitutableByAttributes_type = Substitutable By Attributes
-_UI_DetailsLevelAttributes_filteringCompartment_feature = Filtering Compartment
-_UI_DetailsLevelAttributes_detailsAwareParser_feature = Details Aware Parser
-_UI_SubstitutableByAttributes_substitutableByIDs_feature = Substitutable By IDs
-_UI_SubstitutableByAttributes_substitutableBy_feature = Substitutable By
-_UI_SubstitutableByAttributes_requiresAll_feature = Requires All
-_UI_AbstractDynamicCanonicalContainer_type = Abstract Dynamic Canonical Container
-_UI_DynamicCanonicalCompartment_type = Dynamic Canonical Compartment
-_UI_AbstractDynamicCanonicalContainer_alwaysCanonicalIDs_feature = Always Canonical IDs
-_UI_AbstractDynamicCanonicalContainer_initiallyCanonical_feature = Initially Canonical
-_UI_InteractionDiagramAttributes_type = Interaction Diagram Attributes
-_UI_InteractionDiagramAttributes_multiLayered_feature = Multi Layered
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/plugin.xml b/plugins/org.eclipse.uml2.diagram.codegen.edit/plugin.xml
deleted file mode 100644
index 2584f7e..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/plugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id: plugin.xml,v 1.2 2008/03/04 13:03:28 tfesenko Exp $
--->
-
-<plugin>
-
- <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
- <factory
- uri = "http://www.eclipse.org/uml2/diagram/gmfgenext/DiagramFigure/1.0"
- class = "org.eclipse.uml2.diagram.codegen.gmfgenext.provider.GMFGenExtItemProviderAdapterFactory"
- supportedTypes =
- "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
- org.eclipse.emf.edit.provider.IStructuredItemContentProvider
- org.eclipse.emf.edit.provider.ITreeItemContentProvider
- org.eclipse.emf.edit.provider.IItemLabelProvider
- org.eclipse.emf.edit.provider.IItemPropertySource" />
- </extension>
-
- <extension point="org.eclipse.emf.edit.childCreationExtenders">
- <extender
- uri = "http://www.eclipse.org/gmf/2006/GenModel"
- class = "org.eclipse.uml2.diagram.codegen.gmfgenext.provider.GMFGenExtItemProviderAdapterFactory$GMFGenChildCreationExtender" />
- </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/AbstractDynamicCanonicalContainerItemProvider.java b/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/AbstractDynamicCanonicalContainerItemProvider.java
deleted file mode 100644
index 57536b7..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/AbstractDynamicCanonicalContainerItemProvider.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractDynamicCanonicalContainerItemProvider.java,v 1.2 2008/05/07 17:42:49 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AbstractDynamicCanonicalContainerItemProvider
- 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 AbstractDynamicCanonicalContainerItemProvider(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);
-
- addAlwaysCanonicalIDsPropertyDescriptor(object);
- addInitiallyCanonicalPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Always Canonical IDs feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addAlwaysCanonicalIDsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AbstractDynamicCanonicalContainer_alwaysCanonicalIDs_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_AbstractDynamicCanonicalContainer_alwaysCanonicalIDs_feature", "_UI_AbstractDynamicCanonicalContainer_type"),
- GMFGenExtPackage.Literals.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Initially Canonical feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addInitiallyCanonicalPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AbstractDynamicCanonicalContainer_initiallyCanonical_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_AbstractDynamicCanonicalContainer_initiallyCanonical_feature", "_UI_AbstractDynamicCanonicalContainer_type"),
- GMFGenExtPackage.Literals.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- AbstractDynamicCanonicalContainer abstractDynamicCanonicalContainer = (AbstractDynamicCanonicalContainer)object;
- return getString("_UI_AbstractDynamicCanonicalContainer_type") + " " + abstractDynamicCanonicalContainer.isInitiallyCanonical();
- }
-
- /**
- * 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(AbstractDynamicCanonicalContainer.class)) {
- case GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS:
- case GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing 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 GMFGenExtEditPlugin.INSTANCE;
- }
-
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/AuxSecondaryDiagramNodeAttributeItemProvider.java b/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/AuxSecondaryDiagramNodeAttributeItemProvider.java
deleted file mode 100644
index f0d2297..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/AuxSecondaryDiagramNodeAttributeItemProvider.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AuxSecondaryDiagramNodeAttributeItemProvider.java,v 1.3 2008/05/07 17:42:49 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AuxSecondaryDiagramNodeAttributeItemProvider
- 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 AuxSecondaryDiagramNodeAttributeItemProvider(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);
-
- addSubstituteWithCanvasElementPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Substitute With Canvas Element feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addSubstituteWithCanvasElementPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AuxSecondaryDiagramNodeAttribute_substituteWithCanvasElement_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_AuxSecondaryDiagramNodeAttribute_substituteWithCanvasElement_feature", "_UI_AuxSecondaryDiagramNodeAttribute_type"),
- GMFGenExtPackage.Literals.AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE__SUBSTITUTE_WITH_CANVAS_ELEMENT,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns AuxSecondaryDiagramNodeAttribute.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/AuxSecondaryDiagramNodeAttribute"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- AuxSecondaryDiagramNodeAttribute auxSecondaryDiagramNodeAttribute = (AuxSecondaryDiagramNodeAttribute)object;
- return getString("_UI_AuxSecondaryDiagramNodeAttribute_type") + " " + auxSecondaryDiagramNodeAttribute.isSubstituteWithCanvasElement();
- }
-
- /**
- * 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(AuxSecondaryDiagramNodeAttribute.class)) {
- case GMFGenExtPackage.AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE__SUBSTITUTE_WITH_CANVAS_ELEMENT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing 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 GMFGenExtEditPlugin.INSTANCE;
- }
-
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/CustomLocatorAttributesItemProvider.java b/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/CustomLocatorAttributesItemProvider.java
deleted file mode 100644
index 233b0b6..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/CustomLocatorAttributesItemProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CustomLocatorAttributesItemProvider.java,v 1.3 2008/05/07 17:42:49 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CustomLocatorAttributesItemProvider
- 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 CustomLocatorAttributesItemProvider(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);
-
- addCustomLocatorFQNPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Custom Locator FQN feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addCustomLocatorFQNPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_CustomLocatorAttributes_customLocatorFQN_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_CustomLocatorAttributes_customLocatorFQN_feature", "_UI_CustomLocatorAttributes_type"),
- GMFGenExtPackage.Literals.CUSTOM_LOCATOR_ATTRIBUTES__CUSTOM_LOCATOR_FQN,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns CustomLocatorAttributes.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomLocatorAttributes"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((CustomLocatorAttributes)object).getCustomLocatorFQN();
- return label == null || label.length() == 0 ?
- getString("_UI_CustomLocatorAttributes_type") :
- getString("_UI_CustomLocatorAttributes_type") + " " + label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(CustomLocatorAttributes.class)) {
- case GMFGenExtPackage.CUSTOM_LOCATOR_ATTRIBUTES__CUSTOM_LOCATOR_FQN:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing 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 GMFGenExtEditPlugin.INSTANCE;
- }
-
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/DetailsLevelAttributesItemProvider.java b/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/DetailsLevelAttributesItemProvider.java
deleted file mode 100644
index db9a389..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/DetailsLevelAttributesItemProvider.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DetailsLevelAttributesItemProvider.java,v 1.3 2008/05/07 17:42:49 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DetailsLevelAttributesItemProvider
- 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 DetailsLevelAttributesItemProvider(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);
-
- addFilteringCompartmentPropertyDescriptor(object);
- addDetailsAwareParserPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Filtering Compartment feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addFilteringCompartmentPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_DetailsLevelAttributes_filteringCompartment_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_DetailsLevelAttributes_filteringCompartment_feature", "_UI_DetailsLevelAttributes_type"),
- GMFGenExtPackage.Literals.DETAILS_LEVEL_ATTRIBUTES__FILTERING_COMPARTMENT,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Details Aware Parser feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addDetailsAwareParserPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_DetailsLevelAttributes_detailsAwareParser_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_DetailsLevelAttributes_detailsAwareParser_feature", "_UI_DetailsLevelAttributes_type"),
- GMFGenExtPackage.Literals.DETAILS_LEVEL_ATTRIBUTES__DETAILS_AWARE_PARSER,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns DetailsLevelAttributes.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/DetailsLevelAttributes"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- DetailsLevelAttributes detailsLevelAttributes = (DetailsLevelAttributes)object;
- return getString("_UI_DetailsLevelAttributes_type") + " " + detailsLevelAttributes.isFilteringCompartment();
- }
-
- /**
- * 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(DetailsLevelAttributes.class)) {
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__FILTERING_COMPARTMENT:
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__DETAILS_AWARE_PARSER:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing 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 GMFGenExtEditPlugin.INSTANCE;
- }
-
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/DynamicCanonicalCompartmentItemProvider.java b/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/DynamicCanonicalCompartmentItemProvider.java
deleted file mode 100644
index 2175638..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/DynamicCanonicalCompartmentItemProvider.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DynamicCanonicalCompartmentItemProvider.java,v 1.2 2008/05/07 17:42:49 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.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.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.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DynamicCanonicalCompartmentItemProvider
- extends AbstractDynamicCanonicalContainerItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DynamicCanonicalCompartmentItemProvider(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 DynamicCanonicalCompartment.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/DynamicCanonicalCompartment"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- DynamicCanonicalCompartment dynamicCanonicalCompartment = (DynamicCanonicalCompartment)object;
- return getString("_UI_DynamicCanonicalCompartment_type") + " " + dynamicCanonicalCompartment.isInitiallyCanonical();
- }
-
- /**
- * 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 {@link org.eclipse.emf.edit.command.CommandParameter}s describing 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);
- }
-
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/GMFGenExtEditPlugin.java b/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/GMFGenExtEditPlugin.java
deleted file mode 100644
index c01b9e8..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/GMFGenExtEditPlugin.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GMFGenExtEditPlugin.java,v 1.3 2008/05/07 17:42:49 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.provider;
-
-import org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
-import org.eclipse.gmf.codegen.gmfgen.presentation.EditorPlugin;
-
-/**
- * This is the central singleton for the GMFGenExt edit plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class GMFGenExtEditPlugin extends EMFPlugin {
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final GMFGenExtEditPlugin INSTANCE = new GMFGenExtEditPlugin();
-
- /**
- * 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 GMFGenExtEditPlugin() {
- super
- (new ResourceLocator [] {
- EcoreEditPlugin.INSTANCE,
- GenModelEditPlugin.INSTANCE,
- EditorPlugin.INSTANCE,
- });
- }
-
- /**
- * 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/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/GMFGenExtItemProviderAdapterFactory.java b/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/GMFGenExtItemProviderAdapterFactory.java
deleted file mode 100644
index 44e8fcc..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/GMFGenExtItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GMFGenExtItemProviderAdapterFactory.java,v 1.6 2008/05/07 17:42:49 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-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.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.edit.command.CommandParameter;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-
-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.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.gmf.codegen.gmfgen.Viewmap;
-
-import org.eclipse.gmf.codegen.gmfgen.util.GMFGenSwitch;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtFactory;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.util.GMFGenExtAdapterFactory;
-
-/**
- * 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 GMFGenExtItemProviderAdapterFactory extends GMFGenExtAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public GMFGenExtItemProviderAdapterFactory() {
- 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.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected AuxSecondaryDiagramNodeAttributeItemProvider auxSecondaryDiagramNodeAttributeItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createAuxSecondaryDiagramNodeAttributeAdapter() {
- if (auxSecondaryDiagramNodeAttributeItemProvider == null) {
- auxSecondaryDiagramNodeAttributeItemProvider = new AuxSecondaryDiagramNodeAttributeItemProvider(this);
- }
-
- return auxSecondaryDiagramNodeAttributeItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected CustomLocatorAttributesItemProvider customLocatorAttributesItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createCustomLocatorAttributesAdapter() {
- if (customLocatorAttributesItemProvider == null) {
- customLocatorAttributesItemProvider = new CustomLocatorAttributesItemProvider(this);
- }
-
- return customLocatorAttributesItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DetailsLevelAttributesItemProvider detailsLevelAttributesItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createDetailsLevelAttributesAdapter() {
- if (detailsLevelAttributesItemProvider == null) {
- detailsLevelAttributesItemProvider = new DetailsLevelAttributesItemProvider(this);
- }
-
- return detailsLevelAttributesItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SubstitutableByAttributesItemProvider substitutableByAttributesItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createSubstitutableByAttributesAdapter() {
- if (substitutableByAttributesItemProvider == null) {
- substitutableByAttributesItemProvider = new SubstitutableByAttributesItemProvider(this);
- }
-
- return substitutableByAttributesItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DynamicCanonicalCompartmentItemProvider dynamicCanonicalCompartmentItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createDynamicCanonicalCompartmentAdapter() {
- if (dynamicCanonicalCompartmentItemProvider == null) {
- dynamicCanonicalCompartmentItemProvider = new DynamicCanonicalCompartmentItemProvider(this);
- }
-
- return dynamicCanonicalCompartmentItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected InteractionDiagramAttributesItemProvider interactionDiagramAttributesItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createInteractionDiagramAttributesAdapter() {
- if (interactionDiagramAttributesItemProvider == null) {
- interactionDiagramAttributesItemProvider = new InteractionDiagramAttributesItemProvider(this);
- }
-
- return interactionDiagramAttributesItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This disposes all of the item providers created by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void dispose() {
- if (auxSecondaryDiagramNodeAttributeItemProvider != null) auxSecondaryDiagramNodeAttributeItemProvider.dispose();
- if (customLocatorAttributesItemProvider != null) customLocatorAttributesItemProvider.dispose();
- if (detailsLevelAttributesItemProvider != null) detailsLevelAttributesItemProvider.dispose();
- if (substitutableByAttributesItemProvider != null) substitutableByAttributesItemProvider.dispose();
- if (dynamicCanonicalCompartmentItemProvider != null) dynamicCanonicalCompartmentItemProvider.dispose();
- if (interactionDiagramAttributesItemProvider != null) interactionDiagramAttributesItemProvider.dispose();
- }
-
- /**
- * A child creation extender for the {@link GMFGenPackage}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static class GMFGenChildCreationExtender implements IChildCreationExtender {
- /**
- * The switch for creating child descriptors specific to each extended class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static class CreationSwitch extends GMFGenSwitch {
- /**
- * The child descriptors being populated.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected List newChildDescriptors;
-
- /**
- * The domain in which to create the children.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EditingDomain editingDomain;
-
- /**
- * Creates the a switch for populating child descriptors in the given domain.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- CreationSwitch(List newChildDescriptors, EditingDomain editingDomain) {
- this.newChildDescriptors = newChildDescriptors;
- this.editingDomain = editingDomain;
- }
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object caseViewmap(Viewmap object) {
- newChildDescriptors.add
- (createChildParameter
- (GMFGenPackage.eINSTANCE.getViewmap_Attributes(),
- GMFGenExtFactory.eINSTANCE.createAuxSecondaryDiagramNodeAttribute()));
-
- newChildDescriptors.add
- (createChildParameter
- (GMFGenPackage.eINSTANCE.getViewmap_Attributes(),
- GMFGenExtFactory.eINSTANCE.createCustomLocatorAttributes()));
-
- newChildDescriptors.add
- (createChildParameter
- (GMFGenPackage.eINSTANCE.getViewmap_Attributes(),
- GMFGenExtFactory.eINSTANCE.createDetailsLevelAttributes()));
-
- newChildDescriptors.add
- (createChildParameter
- (GMFGenPackage.eINSTANCE.getViewmap_Attributes(),
- GMFGenExtFactory.eINSTANCE.createSubstitutableByAttributes()));
-
- newChildDescriptors.add
- (createChildParameter
- (GMFGenPackage.eINSTANCE.getViewmap_Attributes(),
- GMFGenExtFactory.eINSTANCE.createDynamicCanonicalCompartment()));
-
- newChildDescriptors.add
- (createChildParameter
- (GMFGenPackage.eINSTANCE.getViewmap_Attributes(),
- GMFGenExtFactory.eINSTANCE.createInteractionDiagramAttributes()));
-
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected CommandParameter createChildParameter(Object feature, Object child) {
- return new CommandParameter(null, feature, child);
- }
-
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Collection getNewChildDescriptors(Object object, EditingDomain editingDomain) {
- ArrayList result = new ArrayList();
- new CreationSwitch(result, editingDomain).doSwitch((EObject)object);
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return GMFGenExtEditPlugin.INSTANCE;
- }
- }
-
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/InteractionDiagramAttributesItemProvider.java b/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/InteractionDiagramAttributesItemProvider.java
deleted file mode 100644
index 53f3277..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/InteractionDiagramAttributesItemProvider.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: InteractionDiagramAttributesItemProvider.java,v 1.1 2008/05/07 17:42:25 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InteractionDiagramAttributesItemProvider
- 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 InteractionDiagramAttributesItemProvider(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);
-
- addMultiLayeredPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Multi Layered feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addMultiLayeredPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_InteractionDiagramAttributes_multiLayered_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_InteractionDiagramAttributes_multiLayered_feature", "_UI_InteractionDiagramAttributes_type"),
- GMFGenExtPackage.Literals.INTERACTION_DIAGRAM_ATTRIBUTES__MULTI_LAYERED,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns InteractionDiagramAttributes.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/InteractionDiagramAttributes"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- InteractionDiagramAttributes interactionDiagramAttributes = (InteractionDiagramAttributes)object;
- return getString("_UI_InteractionDiagramAttributes_type") + " " + interactionDiagramAttributes.isMultiLayered();
- }
-
- /**
- * 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(InteractionDiagramAttributes.class)) {
- case GMFGenExtPackage.INTERACTION_DIAGRAM_ATTRIBUTES__MULTI_LAYERED:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing 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 GMFGenExtEditPlugin.INSTANCE;
- }
-
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/SubstitutableByAttributesItemProvider.java b/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/SubstitutableByAttributesItemProvider.java
deleted file mode 100644
index c6dd732..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen.edit/src/org/eclipse/uml2/diagram/codegen/gmfgenext/provider/SubstitutableByAttributesItemProvider.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SubstitutableByAttributesItemProvider.java,v 1.4 2008/05/07 17:42:49 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SubstitutableByAttributesItemProvider
- 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 SubstitutableByAttributesItemProvider(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);
-
- addSubstitutableByIDsPropertyDescriptor(object);
- addRequiresAllPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Substitutable By IDs feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addSubstitutableByIDsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_SubstitutableByAttributes_substitutableByIDs_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_SubstitutableByAttributes_substitutableByIDs_feature", "_UI_SubstitutableByAttributes_type"),
- GMFGenExtPackage.Literals.SUBSTITUTABLE_BY_ATTRIBUTES__SUBSTITUTABLE_BY_IDS,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Requires All feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addRequiresAllPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_SubstitutableByAttributes_requiresAll_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_SubstitutableByAttributes_requiresAll_feature", "_UI_SubstitutableByAttributes_type"),
- GMFGenExtPackage.Literals.SUBSTITUTABLE_BY_ATTRIBUTES__REQUIRES_ALL,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns SubstitutableByAttributes.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/SubstitutableByAttributes"));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- SubstitutableByAttributes substitutableByAttributes = (SubstitutableByAttributes)object;
- return getString("_UI_SubstitutableByAttributes_type") + " " + substitutableByAttributes.isRequiresAll();
- }
-
- /**
- * 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(SubstitutableByAttributes.class)) {
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__SUBSTITUTABLE_BY_IDS:
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__REQUIRES_ALL:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing 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 GMFGenExtEditPlugin.INSTANCE;
- }
-
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/.classpath b/plugins/org.eclipse.uml2.diagram.codegen/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/.cvsignore b/plugins/org.eclipse.uml2.diagram.codegen/.cvsignore
deleted file mode 100644
index d8bab97..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-.settings
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/.project b/plugins/org.eclipse.uml2.diagram.codegen/.project
deleted file mode 100644
index eb90a28..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.codegen</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/plugins/org.eclipse.uml2.diagram.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.diagram.codegen/META-INF/MANIFEST.MF
deleted file mode 100644
index 9bc7495..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.codegen; singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.uml2.diagram.codegen.gmfgenext,
- org.eclipse.uml2.diagram.codegen.gmfgenext.impl,
- org.eclipse.uml2.diagram.codegen.gmfgenext.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.codegen.ecore;visibility:=reexport,
- org.eclipse.gmf.codegen;visibility:=reexport,
- org.eclipse.gmf.codegen.ui,
- org.eclipse.ui
-Bundle-ActivationPolicy: lazy
-Eclipse-RegisterBuddy: org.eclipse.gmf.codegen
-DynamicImport-Package: org.eclipse.uml2.diagram.codegen.gmfgenext
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/about.html b/plugins/org.eclipse.uml2.diagram.codegen/about.html
deleted file mode 100644
index d35d5ae..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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>
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/build.properties b/plugins/org.eclipse.uml2.diagram.codegen/build.properties
deleted file mode 100644
index 9b2a119..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# <copyright>
-# </copyright>
-#
-# $Id: build.properties,v 1.2 2007/06/12 12:33:34 mgolubev Exp $
-
-bin.includes = .,\
- about.html,\
- model/,\
- META-INF/,\
- plugin.xml,\
- plugin.properties
-src.includes = about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/model/gmfgenext.ecore b/plugins/org.eclipse.uml2.diagram.codegen/model/gmfgenext.ecore
deleted file mode 100644
index 9794731..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/model/gmfgenext.ecore
+++ /dev/null
@@ -1,60 +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="gmfgenext"
- nsURI="http://www.eclipse.org/uml2/diagram/gmfgenext/DiagramFigure/1.0" nsPrefix="uml2.gmfgenext">
- <eClassifiers xsi:type="ecore:EClass" name="AuxSecondaryDiagramNodeAttribute" eSuperTypes="platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//Attributes">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="substituteWithCanvasElement"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="When installed into the top-level node, it should always share the domain element with diagram canvas"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CustomLocatorAttributes" eSuperTypes="platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//Attributes">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="customLocatorFQN" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Applicable for gmfgen::GenChildSideAffixedNode only. Allows to customize IBorderItemLocator implementation"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DetailsLevelAttributes" eSuperTypes="platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//Attributes">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="filteringCompartment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Applicable for gmfgen::GenCompartment only. If set, children of this compartment will be filtered according to actual diagram details level."/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="detailsAwareParser" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="If set, parser for this element should have details-level specific ParserOptions."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="SubstitutableByAttributes" eSuperTypes="platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//Attributes">
- <eOperations name="getSubstitutableByNodes" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="substitutableByIDs" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Allows to have different notation for same semantic element. Diagram updater should choose some default notation, but should treat any of the substitutable nodes as correct representation for given semantic element"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiresAll" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AbstractDynamicCanonicalContainer" abstract="true"
- eSuperTypes="platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//Attributes">
- <eOperations name="getAlwaysCanonicalChildren" upperBound="-1" eType="ecore:EClass platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//GenCommonBase"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="alwaysCanonicalIDs" upperBound="-1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="initiallyCanonical" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="false"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="DynamicCanonicalCompartment" eSuperTypes="#//AbstractDynamicCanonicalContainer"/>
- <eClassifiers xsi:type="ecore:EClass" name="InteractionDiagramAttributes" eSuperTypes="platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.ecore#//Attributes">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiLayered" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
- defaultValueLiteral="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Applicable for gmfgen::GenNode. This node is responcible for distribution of its children's figures between different layers."/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/model/gmfgenext.emf b/plugins/org.eclipse.uml2.diagram.codegen/model/gmfgenext.emf
deleted file mode 100644
index 7ea3964..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/model/gmfgenext.emf
+++ /dev/null
@@ -1,43 +0,0 @@
-@namespace(uri="http://www.eclipse.org/uml2/diagram/gmfgenext/DiagramFigure/1.0", prefix="uml2.gmfgenext")
-package gmfgenext;
-
-import "platform:/resource/org.eclipse.gmf.codegen/models/gmfgen.ecore";
-
-class AuxSecondaryDiagramNodeAttribute extends gmfgen.Attributes {
- @genmodel(documentation="When installed into the top-level node, it should always share the domain element with diagram canvas")
- attr boolean substituteWithCanvasElement;
-}
-
-class CustomLocatorAttributes extends gmfgen.Attributes {
- @genmodel(documentation="Applicable for gmfgen::GenChildSideAffixedNode only. Allows to customize IBorderItemLocator implementation")
- attr String customLocatorFQN;
-}
-
-class DetailsLevelAttributes extends gmfgen.Attributes {
- @genmodel(documentation="Applicable for gmfgen::GenCompartment only. If set, children of this compartment will be filtered according to actual diagram details level.")
- attr boolean filteringCompartment;
- @genmodel(documentation="If set, parser for this element should have details-level specific ParserOptions.")
- attr boolean detailsAwareParser;
-}
-
-class SubstitutableByAttributes extends gmfgen.Attributes {
- @genmodel(documentation="Allows to have different notation for same semantic element. Diagram updater should choose some default notation, but should treat any of the substitutable nodes as correct representation for given semantic element")
- attr int[*] substitutableByIDs;
- attr boolean requiresAll;
- op gmfgen.GenCommonBase[*] getSubstitutableByNodes();
-}
-
-abstract class AbstractDynamicCanonicalContainer extends gmfgen.Attributes {
- attr int[*] alwaysCanonicalIDs;
- attr boolean initiallyCanonical = false;
-
- op gmfgen.GenCommonBase[*] getAlwaysCanonicalChildren();
-}
-
-class DynamicCanonicalCompartment extends AbstractDynamicCanonicalContainer {
-}
-
-class InteractionDiagramAttributes extends gmfgen.Attributes {
- @genmodel(documentation="Applicable for gmfgen::GenNode. This node is responcible for distribution of its children's figures between different layers.")
- attr boolean multiLayered = true;
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/model/gmfgenext.genmodel b/plugins/org.eclipse.uml2.diagram.codegen/model/gmfgenext.genmodel
deleted file mode 100644
index 0c5d431..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/model/gmfgenext.genmodel
+++ /dev/null
@@ -1,35 +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" copyrightText=""
- modelDirectory="/org.eclipse.uml2.diagram.codegen/src" modelPluginID="org.eclipse.uml2.diagram.codegen"
- modelName="GMFGenExt" importerID="org.eclipse.emf.importer.ecore" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel#//genmodel platform:/plugin/org.eclipse.gmf.codegen/models/gmfgen.genmodel#//gmfgen">
- <foreignModel>gmfgenext.ecore</foreignModel>
- <genPackages prefix="GMFGenExt" basePackage="org.eclipse.uml2.diagram.codegen" disposableProviderFactory="true"
- childCreationExtenders="true" ecorePackage="gmfgenext.ecore#/">
- <genClasses ecoreClass="gmfgenext.ecore#//AuxSecondaryDiagramNodeAttribute">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgenext.ecore#//AuxSecondaryDiagramNodeAttribute/substituteWithCanvasElement"/>
- </genClasses>
- <genClasses ecoreClass="gmfgenext.ecore#//CustomLocatorAttributes">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgenext.ecore#//CustomLocatorAttributes/customLocatorFQN"/>
- </genClasses>
- <genClasses ecoreClass="gmfgenext.ecore#//DetailsLevelAttributes">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgenext.ecore#//DetailsLevelAttributes/filteringCompartment"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgenext.ecore#//DetailsLevelAttributes/detailsAwareParser"/>
- </genClasses>
- <genClasses ecoreClass="gmfgenext.ecore#//SubstitutableByAttributes">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgenext.ecore#//SubstitutableByAttributes/substitutableByIDs"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgenext.ecore#//SubstitutableByAttributes/requiresAll"/>
- <genOperations ecoreOperation="gmfgenext.ecore#//SubstitutableByAttributes/getSubstitutableByNodes"/>
- </genClasses>
- <genClasses image="false" ecoreClass="gmfgenext.ecore#//AbstractDynamicCanonicalContainer">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgenext.ecore#//AbstractDynamicCanonicalContainer/alwaysCanonicalIDs"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgenext.ecore#//AbstractDynamicCanonicalContainer/initiallyCanonical"/>
- <genOperations ecoreOperation="gmfgenext.ecore#//AbstractDynamicCanonicalContainer/getAlwaysCanonicalChildren"/>
- </genClasses>
- <genClasses ecoreClass="gmfgenext.ecore#//DynamicCanonicalCompartment"/>
- <genClasses ecoreClass="gmfgenext.ecore#//InteractionDiagramAttributes">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgenext.ecore#//InteractionDiagramAttributes/multiLayered"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/plugin.properties b/plugins/org.eclipse.uml2.diagram.codegen/plugin.properties
deleted file mode 100644
index baa057d..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# <copyright>
-# </copyright>
-#
-# $Id: plugin.properties,v 1.5 2007/08/16 16:43:07 mgolubev 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 = UML2Tools Generation Helpers Model (Incubation)
-providerName = Eclipse.org
-
-generateDiagramAction.name = Generate UML2Tools Diagrams
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/plugin.xml b/plugins/org.eclipse.uml2.diagram.codegen/plugin.xml
deleted file mode 100644
index a5a1236..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri = "http://www.eclipse.org/uml2/diagram/gmfgenext/DiagramFigure/1.0"
- class = "org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage"
- genModel = "model/gmfgenext.genmodel" />
- </extension>
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- adaptable="true"
- id="org.eclipse.uml2.diagram.codegen.executeTemplates"
- nameFilter="*.gmfgen"
- objectClass="org.eclipse.core.resources.IFile">
- <action
- label="%generateDiagramAction.name "
- class="org.eclipse.uml2.diagram.codegen.ui.ExecuteTemplatesActionExt"
- menubarPath="additions"
- enablesFor="1"
- id="org.eclipse.uml2.diagram.codegen.executeTemplates">
- </action>
- </objectContribution>
- </extension>
-</plugin>
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/CodegenEmittersExt.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/CodegenEmittersExt.java
deleted file mode 100644
index 7bee61d..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/CodegenEmittersExt.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.uml2.diagram.codegen;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.gmf.codegen.util.CodegenEmitters;
-import org.eclipse.gmf.common.UnexpectedBehaviourException;
-import org.eclipse.gmf.internal.common.codegen.TextEmitter;
-
-
-public class CodegenEmittersExt extends CodegenEmitters {
-
- public CodegenEmittersExt(boolean useBaseTemplatesOnly, String templateDirectory, boolean includeDynamicModelTemplates) {
- super(useBaseTemplatesOnly, templateDirectory, includeDynamicModelTemplates);
- }
-
- public TextEmitter getChangeNotationActionEmitter() throws UnexpectedBehaviourException {
- return newXpandEmitter("xpt::actions::ChangeNotationAction::ChangeNotationAction"); //$NON-NLS-1$
- }
-
- public String getChangeNotationActionName(Object... input) throws UnexpectedBehaviourException {
- return getQualifiedClassName("xpt::actions::ChangeNotationAction::qualifiedClassName", input); //$NON-NLS-1$
- }
-
- public TextEmitter getChangeNotationContributionItemProviderEmitter() throws UnexpectedBehaviourException {
- return newXpandEmitter("xpt::actions::ChangeNotationContributionItemProvider::ChangeNotationContributionItemProvider"); //$NON-NLS-1$
- }
-
-// public TextEmitter getDynamicCanonicalEditPolicyEmitter() throws UnexpectedBehaviourException {
-// return newXpandEmitter("xpt::diagram::canonical::DynamicCanonicalEditPolicy::DynamicCanonicalEditPolicy"); //$NON-NLS-1$
-// }
-//
-// public TextEmitter getDynamicCanonicalEditPolicyFQNEmitter() throws UnexpectedBehaviourException {
-// return newXpandEmitter("xpt::diagram::canonical::DynamicCanonicalEditPolicy::DynamicCanonicalEditPolicyFQN"); //$NON-NLS-1$
-// }
-//
-
- public String getChangeNotationContributionItemProviderName(Object... input) throws UnexpectedBehaviourException {
- return getQualifiedClassName("xpt::actions::ChangeNotationContributionItemProvider::qualifiedClassName", input); //$NON-NLS-1$
- }
-
- public TextEmitter getIconStylePreferencePageEmitter() throws UnexpectedBehaviourException {
- return newXpandEmitter("xpt::preferences::IconStylePreferencePage::IconStylePreferencePage"); //$NON-NLS-1$
- }
-
- public String getIconStylePreferencePageFQN(Object... input) throws UnexpectedBehaviourException {
- return getQualifiedClassName("xpt::preferences::IconStylePreferencePage::qualifiedClassName", input); //$NON-NLS-1$
- }
-
- public TextEmitter getViewFiltersPreferencePageEmitter() throws UnexpectedBehaviourException {
- return newXpandEmitter("xpt::preferences::ViewFiltersPreferencePage::ViewFiltersPreferencePage"); //$NON-NLS-1$
- }
-
- public String getViewFiltersPreferencePageFQN(Object... input) throws UnexpectedBehaviourException {
- return getQualifiedClassName("xpt::preferences::ViewFiltersPreferencePage::qualifiedClassName", input); //$NON-NLS-1$
- }
-
- public boolean isViewFiltersPreferencePage(Object... input) throws UnexpectedBehaviourException {
- TextEmitter emitter = newXpandEmitter("xpt::preferences::ViewFiltersPreferencePage::isViewFiltersPreferencePage");//$NON-NLS-1$
- String result = getText(emitter, input);
- return Boolean.valueOf(result);
- }
-
- /**
- * Returns qualified class name defined in template.
- */
- private String getQualifiedClassName(String templateName, Object... input) throws UnexpectedBehaviourException {
- TextEmitter emitter = newXpandEmitter(templateName);
- return getText(emitter, input);
- }
-
- /**
- * copy from the private method in super class
- * Returns text generated by emitter.
- */
- private String getText(TextEmitter emitter, Object... input) throws UnexpectedBehaviourException {
- try {
- return emitter.generate(new NullProgressMonitor(), input).trim();
- } catch (InterruptedException ie) {
- return null;
- } catch (InvocationTargetException ite) {
- throw new UnexpectedBehaviourException(ite.getCause());
- }
- }
-
-
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/ExecuteTemplatesOperationExt.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/ExecuteTemplatesOperationExt.java
deleted file mode 100644
index 17f77b3..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/ExecuteTemplatesOperationExt.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.eclipse.uml2.diagram.codegen;
-
-import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.gmf.codegen.util.Generator;
-import org.eclipse.gmf.internal.codegen.popup.actions.ExecuteTemplatesOperation;
-
-
-public class ExecuteTemplatesOperationExt extends ExecuteTemplatesOperation {
- @Override
- protected Generator createGenerator() {
- GenEditorGenerator genModel = getGenModel();
- return new GeneratorExt(genModel, new CodegenEmittersExt(!genModel.isDynamicTemplates(), genModel.getTemplateDirectory(), genModel.getModelAccess() != null));
- }
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/GeneratorExt.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/GeneratorExt.java
deleted file mode 100644
index 7f3eb4c..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/GeneratorExt.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.eclipse.uml2.diagram.codegen;
-
-import org.eclipse.gmf.codegen.gmfgen.GenCustomPreferencePage;
-import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.gmf.codegen.gmfgen.GenPreferencePage;
-import org.eclipse.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.gmf.codegen.util.Generator;
-import org.eclipse.gmf.common.UnexpectedBehaviourException;
-import org.eclipse.gmf.internal.common.codegen.TextMerger;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes;
-
-public class GeneratorExt extends Generator {
-
- private final GenDiagram myDiagram;
- private final CodegenEmittersExt myEmitters;
-
- public GeneratorExt(GenEditorGenerator genModel, CodegenEmittersExt emitters) {
- super(genModel, emitters);
- myDiagram = genModel.getDiagram();
- myEmitters = emitters;
- }
- @Override
- protected TextMerger createMergeService() {
- //see #181484, temporary workaround
- final TextMerger defaultMerger = super.createMergeService();
- return new TextMerger(){
- @Override
- public String process(String fileNameExt, String oldText, String newText) {
- if ("properties".equals(fileNameExt) && newText != null && newText.contains("#seeBugzilla=181484")){
- return newText;
- }
- return defaultMerger.process(fileNameExt, oldText, newText);
- }
-
- @Override
- public String mergeJava(String oldText, String newText) {
- return defaultMerger.mergeJava(oldText, newText);
- }
-
- @Override
- public String mergeProperties(String oldText, String newText) {
- return defaultMerger.mergeProperties(oldText, newText);
- }
-
- @Override
- public String mergeXML(String oldText, String newText) {
- return defaultMerger.mergeXML(oldText, newText);
- }
- };
- }
-
- @Override
- protected void customRun() throws InterruptedException, UnexpectedBehaviourException {
- super.customRun();
- for (GenTopLevelNode node : myDiagram.getTopLevelNodes()) {
- generateChangeNotationAction(node);
- }
- generateIconStylePreferencesPage(myDiagram);
- generateViewFiltersPreferencesPage(myDiagram);
- }
-
- private void generateChangeNotationAction(GenTopLevelNode node) throws InterruptedException, UnexpectedBehaviourException {
- for (org.eclipse.gmf.codegen.gmfgen.Attributes attr : node.getViewmap().getAttributes()) {
- if (false == attr instanceof SubstitutableByAttributes) {
- continue;
- }
- SubstitutableByAttributes sba = (SubstitutableByAttributes) attr;
- if (sba.isRequiresAll()) {
- return;
- }
- doGenerateJavaClass(myEmitters.getChangeNotationContributionItemProviderEmitter(), myEmitters.getChangeNotationContributionItemProviderName(new Object[] { node }), node);
- for (Object substitutableByNode : sba.getSubstitutableByNodes()) {
- doGenerateJavaClass(myEmitters.getChangeNotationActionEmitter(), myEmitters.getChangeNotationActionName(new Object[] { node, substitutableByNode }), node, substitutableByNode);
- }
- // we process only the first attribute
- return;
- }
- }
-
- private void generateIconStylePreferencesPage(GenDiagram diagram) throws InterruptedException, UnexpectedBehaviourException {
- doGenerateJavaClass(//
- myEmitters.getIconStylePreferencePageEmitter(), //
- myEmitters.getIconStylePreferencePageFQN(new Object[] { diagram }), //
- diagram);
- }
-
- private void generateViewFiltersPreferencesPage(GenDiagram diagram) throws InterruptedException, UnexpectedBehaviourException {
- for (GenPreferencePage page : diagram.getPreferencePages()) {
- generateViewFiltersPreferencesPage(page);
- }
- }
- private void generateViewFiltersPreferencesPage(GenPreferencePage page) throws InterruptedException, UnexpectedBehaviourException {
- if (page instanceof GenCustomPreferencePage && myEmitters.isViewFiltersPreferencePage(new Object[] { page })) {
- doGenerateJavaClass(//
- myEmitters.getViewFiltersPreferencePageEmitter(), //
- myEmitters.getViewFiltersPreferencePageFQN(new Object[] { page }), //
- page);
- }
- for (GenPreferencePage child : page.getChildren()) {
- generateViewFiltersPreferencesPage(child);
- }
- }
-
-}
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/AbstractDynamicCanonicalContainer.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/AbstractDynamicCanonicalContainer.java
deleted file mode 100644
index 1bfd4b7..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/AbstractDynamicCanonicalContainer.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractDynamicCanonicalContainer.java,v 1.1 2008/05/07 17:36:56 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.gmf.codegen.gmfgen.Attributes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Dynamic Canonical Container</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer#getAlwaysCanonicalIDs <em>Always Canonical IDs</em>}</li>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer#isInitiallyCanonical <em>Initially Canonical</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getAbstractDynamicCanonicalContainer()
- * @model abstract="true"
- * @generated
- */
-public interface AbstractDynamicCanonicalContainer extends Attributes {
- /**
- * Returns the value of the '<em><b>Always Canonical IDs</b></em>' attribute list.
- * The list contents are of type {@link java.lang.Integer}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Always Canonical IDs</em>' attribute list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Always Canonical IDs</em>' attribute list.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getAbstractDynamicCanonicalContainer_AlwaysCanonicalIDs()
- * @model
- * @generated
- */
- EList getAlwaysCanonicalIDs();
-
- /**
- * Returns the value of the '<em><b>Initially Canonical</b></em>' attribute.
- * The default value is <code>"false"</code>.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Initially Canonical</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Initially Canonical</em>' attribute.
- * @see #setInitiallyCanonical(boolean)
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getAbstractDynamicCanonicalContainer_InitiallyCanonical()
- * @model default="false"
- * @generated
- */
- boolean isInitiallyCanonical();
-
- /**
- * Sets the value of the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer#isInitiallyCanonical <em>Initially Canonical</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Initially Canonical</em>' attribute.
- * @see #isInitiallyCanonical()
- * @generated
- */
- void setInitiallyCanonical(boolean value);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model kind="operation" type="org.eclipse.gmf.codegen.gmfgen.GenCommonBase"
- * @generated
- */
- EList getAlwaysCanonicalChildren();
-
-} // AbstractDynamicCanonicalContainer
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/AuxSecondaryDiagramNodeAttribute.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/AuxSecondaryDiagramNodeAttribute.java
deleted file mode 100644
index 1ce7951..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/AuxSecondaryDiagramNodeAttribute.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AuxSecondaryDiagramNodeAttribute.java,v 1.2 2007/11/22 16:59:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext;
-
-import org.eclipse.gmf.codegen.gmfgen.Attributes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Aux Secondary Diagram Node Attribute</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute#isSubstituteWithCanvasElement <em>Substitute With Canvas Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getAuxSecondaryDiagramNodeAttribute()
- * @model
- * @generated
- */
-public interface AuxSecondaryDiagramNodeAttribute extends Attributes {
- /**
- * Returns the value of the '<em><b>Substitute With Canvas Element</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * When installed into the top-level node, it should always share the domain element with diagram canvas
- * <!-- end-model-doc -->
- * @return the value of the '<em>Substitute With Canvas Element</em>' attribute.
- * @see #setSubstituteWithCanvasElement(boolean)
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getAuxSecondaryDiagramNodeAttribute_SubstituteWithCanvasElement()
- * @model
- * @generated
- */
- boolean isSubstituteWithCanvasElement();
-
- /**
- * Sets the value of the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute#isSubstituteWithCanvasElement <em>Substitute With Canvas Element</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Substitute With Canvas Element</em>' attribute.
- * @see #isSubstituteWithCanvasElement()
- * @generated
- */
- void setSubstituteWithCanvasElement(boolean value);
-
-} // AuxSecondaryDiagramNodeAttribute
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/CustomLocatorAttributes.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/CustomLocatorAttributes.java
deleted file mode 100644
index 0120438..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/CustomLocatorAttributes.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CustomLocatorAttributes.java,v 1.2 2007/11/22 16:59:34 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext;
-
-import org.eclipse.gmf.codegen.gmfgen.Attributes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Locator Attributes</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes#getCustomLocatorFQN <em>Custom Locator FQN</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getCustomLocatorAttributes()
- * @model
- * @generated
- */
-public interface CustomLocatorAttributes extends Attributes {
- /**
- * Returns the value of the '<em><b>Custom Locator FQN</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Applicable for gmfgen::GenChildSideAffixedNode only. Allows to customize IBorderItemLocator implementation
- * <!-- end-model-doc -->
- * @return the value of the '<em>Custom Locator FQN</em>' attribute.
- * @see #setCustomLocatorFQN(String)
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getCustomLocatorAttributes_CustomLocatorFQN()
- * @model
- * @generated
- */
- String getCustomLocatorFQN();
-
- /**
- * Sets the value of the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes#getCustomLocatorFQN <em>Custom Locator FQN</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Custom Locator FQN</em>' attribute.
- * @see #getCustomLocatorFQN()
- * @generated
- */
- void setCustomLocatorFQN(String value);
-
-} // CustomLocatorAttributes
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/DetailsLevelAttributes.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/DetailsLevelAttributes.java
deleted file mode 100644
index 182baae..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/DetailsLevelAttributes.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DetailsLevelAttributes.java,v 1.2 2007/11/22 16:59:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext;
-
-import org.eclipse.gmf.codegen.gmfgen.Attributes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Details Level Attributes</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes#isFilteringCompartment <em>Filtering Compartment</em>}</li>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes#isDetailsAwareParser <em>Details Aware Parser</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getDetailsLevelAttributes()
- * @model
- * @generated
- */
-public interface DetailsLevelAttributes extends Attributes {
- /**
- * Returns the value of the '<em><b>Filtering Compartment</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Applicable for gmfgen::GenCompartment only. If set, children of this compartment will be filtered according to actual diagram details level.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Filtering Compartment</em>' attribute.
- * @see #setFilteringCompartment(boolean)
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getDetailsLevelAttributes_FilteringCompartment()
- * @model
- * @generated
- */
- boolean isFilteringCompartment();
-
- /**
- * Sets the value of the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes#isFilteringCompartment <em>Filtering Compartment</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Filtering Compartment</em>' attribute.
- * @see #isFilteringCompartment()
- * @generated
- */
- void setFilteringCompartment(boolean value);
-
- /**
- * Returns the value of the '<em><b>Details Aware Parser</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * If set, parser for this element should have details-level specific ParserOptions.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Details Aware Parser</em>' attribute.
- * @see #setDetailsAwareParser(boolean)
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getDetailsLevelAttributes_DetailsAwareParser()
- * @model
- * @generated
- */
- boolean isDetailsAwareParser();
-
- /**
- * Sets the value of the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes#isDetailsAwareParser <em>Details Aware Parser</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Details Aware Parser</em>' attribute.
- * @see #isDetailsAwareParser()
- * @generated
- */
- void setDetailsAwareParser(boolean value);
-
-} // DetailsLevelAttributes
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/DynamicCanonicalCompartment.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/DynamicCanonicalCompartment.java
deleted file mode 100644
index ace334c..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/DynamicCanonicalCompartment.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DynamicCanonicalCompartment.java,v 1.1 2008/05/07 17:36:56 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dynamic Canonical Compartment</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getDynamicCanonicalCompartment()
- * @model
- * @generated
- */
-public interface DynamicCanonicalCompartment extends AbstractDynamicCanonicalContainer {
-} // DynamicCanonicalCompartment
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/GMFGenExtFactory.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/GMFGenExtFactory.java
deleted file mode 100644
index 24c1886..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/GMFGenExtFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GMFGenExtFactory.java,v 1.4 2008/05/07 17:37:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext;
-
-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.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage
- * @generated
- */
-public interface GMFGenExtFactory extends EFactory {
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- GMFGenExtFactory eINSTANCE = org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Aux Secondary Diagram Node Attribute</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Aux Secondary Diagram Node Attribute</em>'.
- * @generated
- */
- AuxSecondaryDiagramNodeAttribute createAuxSecondaryDiagramNodeAttribute();
-
- /**
- * Returns a new object of class '<em>Custom Locator Attributes</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Custom Locator Attributes</em>'.
- * @generated
- */
- CustomLocatorAttributes createCustomLocatorAttributes();
-
- /**
- * Returns a new object of class '<em>Details Level Attributes</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Details Level Attributes</em>'.
- * @generated
- */
- DetailsLevelAttributes createDetailsLevelAttributes();
-
- /**
- * Returns a new object of class '<em>Substitutable By Attributes</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Substitutable By Attributes</em>'.
- * @generated
- */
- SubstitutableByAttributes createSubstitutableByAttributes();
-
- /**
- * Returns a new object of class '<em>Dynamic Canonical Compartment</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Dynamic Canonical Compartment</em>'.
- * @generated
- */
- DynamicCanonicalCompartment createDynamicCanonicalCompartment();
-
- /**
- * Returns a new object of class '<em>Interaction Diagram Attributes</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Interaction Diagram Attributes</em>'.
- * @generated
- */
- InteractionDiagramAttributes createInteractionDiagramAttributes();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the package supported by this factory.
- * @generated
- */
- GMFGenExtPackage getGMFGenExtPackage();
-
-} //GMFGenExtFactory
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/GMFGenExtPackage.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/GMFGenExtPackage.java
deleted file mode 100644
index 1385e10..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/GMFGenExtPackage.java
+++ /dev/null
@@ -1,632 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GMFGenExtPackage.java,v 1.5 2008/05/07 17:37:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
-
-/**
- * <!-- 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.uml2.diagram.codegen.gmfgenext.GMFGenExtFactory
- * @model kind="package"
- * @generated
- */
-public interface GMFGenExtPackage extends EPackage {
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNAME = "gmfgenext";
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_URI = "http://www.eclipse.org/uml2/diagram/gmfgenext/DiagramFigure/1.0";
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- String eNS_PREFIX = "uml2.gmfgenext";
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- GMFGenExtPackage eINSTANCE = org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.AuxSecondaryDiagramNodeAttributeImpl <em>Aux Secondary Diagram Node Attribute</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.AuxSecondaryDiagramNodeAttributeImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getAuxSecondaryDiagramNodeAttribute()
- * @generated
- */
- int AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE = 0;
-
- /**
- * The feature id for the '<em><b>Substitute With Canvas Element</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE__SUBSTITUTE_WITH_CANVAS_ELEMENT = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Aux Secondary Diagram Node Attribute</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE_FEATURE_COUNT = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 1;
-
-
- /**
- * The meta object id for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.CustomLocatorAttributesImpl <em>Custom Locator Attributes</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.CustomLocatorAttributesImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getCustomLocatorAttributes()
- * @generated
- */
- int CUSTOM_LOCATOR_ATTRIBUTES = 1;
-
- /**
- * The feature id for the '<em><b>Custom Locator FQN</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CUSTOM_LOCATOR_ATTRIBUTES__CUSTOM_LOCATOR_FQN = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Custom Locator Attributes</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int CUSTOM_LOCATOR_ATTRIBUTES_FEATURE_COUNT = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 1;
-
-
- /**
- * The meta object id for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.DetailsLevelAttributesImpl <em>Details Level Attributes</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.DetailsLevelAttributesImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getDetailsLevelAttributes()
- * @generated
- */
- int DETAILS_LEVEL_ATTRIBUTES = 2;
-
- /**
- * The feature id for the '<em><b>Filtering Compartment</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DETAILS_LEVEL_ATTRIBUTES__FILTERING_COMPARTMENT = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Details Aware Parser</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DETAILS_LEVEL_ATTRIBUTES__DETAILS_AWARE_PARSER = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Details Level Attributes</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DETAILS_LEVEL_ATTRIBUTES_FEATURE_COUNT = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.SubstitutableByAttributesImpl <em>Substitutable By Attributes</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.SubstitutableByAttributesImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getSubstitutableByAttributes()
- * @generated
- */
- int SUBSTITUTABLE_BY_ATTRIBUTES = 3;
-
- /**
- * The feature id for the '<em><b>Substitutable By IDs</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SUBSTITUTABLE_BY_ATTRIBUTES__SUBSTITUTABLE_BY_IDS = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Requires All</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SUBSTITUTABLE_BY_ATTRIBUTES__REQUIRES_ALL = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Substitutable By Attributes</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SUBSTITUTABLE_BY_ATTRIBUTES_FEATURE_COUNT = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 2;
-
-
- /**
- * The meta object id for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.AbstractDynamicCanonicalContainerImpl <em>Abstract Dynamic Canonical Container</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.AbstractDynamicCanonicalContainerImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getAbstractDynamicCanonicalContainer()
- * @generated
- */
- int ABSTRACT_DYNAMIC_CANONICAL_CONTAINER = 4;
-
- /**
- * The feature id for the '<em><b>Always Canonical IDs</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Initially Canonical</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 1;
-
- /**
- * The number of structural features of the '<em>Abstract Dynamic Canonical Container</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int ABSTRACT_DYNAMIC_CANONICAL_CONTAINER_FEATURE_COUNT = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.DynamicCanonicalCompartmentImpl <em>Dynamic Canonical Compartment</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.DynamicCanonicalCompartmentImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getDynamicCanonicalCompartment()
- * @generated
- */
- int DYNAMIC_CANONICAL_COMPARTMENT = 5;
-
- /**
- * The feature id for the '<em><b>Always Canonical IDs</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DYNAMIC_CANONICAL_COMPARTMENT__ALWAYS_CANONICAL_IDS = ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS;
-
- /**
- * The feature id for the '<em><b>Initially Canonical</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DYNAMIC_CANONICAL_COMPARTMENT__INITIALLY_CANONICAL = ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL;
-
- /**
- * The number of structural features of the '<em>Dynamic Canonical Compartment</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int DYNAMIC_CANONICAL_COMPARTMENT_FEATURE_COUNT = ABSTRACT_DYNAMIC_CANONICAL_CONTAINER_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.InteractionDiagramAttributesImpl <em>Interaction Diagram Attributes</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.InteractionDiagramAttributesImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getInteractionDiagramAttributes()
- * @generated
- */
- int INTERACTION_DIAGRAM_ATTRIBUTES = 6;
-
- /**
- * The feature id for the '<em><b>Multi Layered</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INTERACTION_DIAGRAM_ATTRIBUTES__MULTI_LAYERED = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Interaction Diagram Attributes</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int INTERACTION_DIAGRAM_ATTRIBUTES_FEATURE_COUNT = GMFGenPackage.ATTRIBUTES_FEATURE_COUNT + 1;
-
- /**
- * Returns the meta object for class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute <em>Aux Secondary Diagram Node Attribute</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Aux Secondary Diagram Node Attribute</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute
- * @generated
- */
- EClass getAuxSecondaryDiagramNodeAttribute();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute#isSubstituteWithCanvasElement <em>Substitute With Canvas Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Substitute With Canvas Element</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute#isSubstituteWithCanvasElement()
- * @see #getAuxSecondaryDiagramNodeAttribute()
- * @generated
- */
- EAttribute getAuxSecondaryDiagramNodeAttribute_SubstituteWithCanvasElement();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes <em>Custom Locator Attributes</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Custom Locator Attributes</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes
- * @generated
- */
- EClass getCustomLocatorAttributes();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes#getCustomLocatorFQN <em>Custom Locator FQN</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Custom Locator FQN</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes#getCustomLocatorFQN()
- * @see #getCustomLocatorAttributes()
- * @generated
- */
- EAttribute getCustomLocatorAttributes_CustomLocatorFQN();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes <em>Details Level Attributes</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Details Level Attributes</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes
- * @generated
- */
- EClass getDetailsLevelAttributes();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes#isFilteringCompartment <em>Filtering Compartment</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Filtering Compartment</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes#isFilteringCompartment()
- * @see #getDetailsLevelAttributes()
- * @generated
- */
- EAttribute getDetailsLevelAttributes_FilteringCompartment();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes#isDetailsAwareParser <em>Details Aware Parser</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Details Aware Parser</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes#isDetailsAwareParser()
- * @see #getDetailsLevelAttributes()
- * @generated
- */
- EAttribute getDetailsLevelAttributes_DetailsAwareParser();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes <em>Substitutable By Attributes</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Substitutable By Attributes</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes
- * @generated
- */
- EClass getSubstitutableByAttributes();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes#getSubstitutableByIDs <em>Substitutable By IDs</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Substitutable By IDs</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes#getSubstitutableByIDs()
- * @see #getSubstitutableByAttributes()
- * @generated
- */
- EAttribute getSubstitutableByAttributes_SubstitutableByIDs();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes#isRequiresAll <em>Requires All</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Requires All</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes#isRequiresAll()
- * @see #getSubstitutableByAttributes()
- * @generated
- */
- EAttribute getSubstitutableByAttributes_RequiresAll();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer <em>Abstract Dynamic Canonical Container</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Abstract Dynamic Canonical Container</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer
- * @generated
- */
- EClass getAbstractDynamicCanonicalContainer();
-
- /**
- * Returns the meta object for the attribute list '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer#getAlwaysCanonicalIDs <em>Always Canonical IDs</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute list '<em>Always Canonical IDs</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer#getAlwaysCanonicalIDs()
- * @see #getAbstractDynamicCanonicalContainer()
- * @generated
- */
- EAttribute getAbstractDynamicCanonicalContainer_AlwaysCanonicalIDs();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer#isInitiallyCanonical <em>Initially Canonical</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Initially Canonical</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer#isInitiallyCanonical()
- * @see #getAbstractDynamicCanonicalContainer()
- * @generated
- */
- EAttribute getAbstractDynamicCanonicalContainer_InitiallyCanonical();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment <em>Dynamic Canonical Compartment</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Dynamic Canonical Compartment</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment
- * @generated
- */
- EClass getDynamicCanonicalCompartment();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes <em>Interaction Diagram Attributes</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Interaction Diagram Attributes</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes
- * @generated
- */
- EClass getInteractionDiagramAttributes();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes#isMultiLayered <em>Multi Layered</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Multi Layered</em>'.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes#isMultiLayered()
- * @see #getInteractionDiagramAttributes()
- * @generated
- */
- EAttribute getInteractionDiagramAttributes_MultiLayered();
-
- /**
- * 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
- */
- GMFGenExtFactory getGMFGenExtFactory();
-
- /**
- * <!-- 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.uml2.diagram.codegen.gmfgenext.impl.AuxSecondaryDiagramNodeAttributeImpl <em>Aux Secondary Diagram Node Attribute</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.AuxSecondaryDiagramNodeAttributeImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getAuxSecondaryDiagramNodeAttribute()
- * @generated
- */
- EClass AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE = eINSTANCE.getAuxSecondaryDiagramNodeAttribute();
-
- /**
- * The meta object literal for the '<em><b>Substitute With Canvas Element</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE__SUBSTITUTE_WITH_CANVAS_ELEMENT = eINSTANCE.getAuxSecondaryDiagramNodeAttribute_SubstituteWithCanvasElement();
-
- /**
- * The meta object literal for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.CustomLocatorAttributesImpl <em>Custom Locator Attributes</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.CustomLocatorAttributesImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getCustomLocatorAttributes()
- * @generated
- */
- EClass CUSTOM_LOCATOR_ATTRIBUTES = eINSTANCE.getCustomLocatorAttributes();
-
- /**
- * The meta object literal for the '<em><b>Custom Locator FQN</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute CUSTOM_LOCATOR_ATTRIBUTES__CUSTOM_LOCATOR_FQN = eINSTANCE.getCustomLocatorAttributes_CustomLocatorFQN();
-
- /**
- * The meta object literal for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.DetailsLevelAttributesImpl <em>Details Level Attributes</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.DetailsLevelAttributesImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getDetailsLevelAttributes()
- * @generated
- */
- EClass DETAILS_LEVEL_ATTRIBUTES = eINSTANCE.getDetailsLevelAttributes();
-
- /**
- * The meta object literal for the '<em><b>Filtering Compartment</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute DETAILS_LEVEL_ATTRIBUTES__FILTERING_COMPARTMENT = eINSTANCE.getDetailsLevelAttributes_FilteringCompartment();
-
- /**
- * The meta object literal for the '<em><b>Details Aware Parser</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute DETAILS_LEVEL_ATTRIBUTES__DETAILS_AWARE_PARSER = eINSTANCE.getDetailsLevelAttributes_DetailsAwareParser();
-
- /**
- * The meta object literal for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.SubstitutableByAttributesImpl <em>Substitutable By Attributes</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.SubstitutableByAttributesImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getSubstitutableByAttributes()
- * @generated
- */
- EClass SUBSTITUTABLE_BY_ATTRIBUTES = eINSTANCE.getSubstitutableByAttributes();
-
- /**
- * The meta object literal for the '<em><b>Substitutable By IDs</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute SUBSTITUTABLE_BY_ATTRIBUTES__SUBSTITUTABLE_BY_IDS = eINSTANCE.getSubstitutableByAttributes_SubstitutableByIDs();
-
- /**
- * The meta object literal for the '<em><b>Requires All</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute SUBSTITUTABLE_BY_ATTRIBUTES__REQUIRES_ALL = eINSTANCE.getSubstitutableByAttributes_RequiresAll();
-
- /**
- * The meta object literal for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.AbstractDynamicCanonicalContainerImpl <em>Abstract Dynamic Canonical Container</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.AbstractDynamicCanonicalContainerImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getAbstractDynamicCanonicalContainer()
- * @generated
- */
- EClass ABSTRACT_DYNAMIC_CANONICAL_CONTAINER = eINSTANCE.getAbstractDynamicCanonicalContainer();
-
- /**
- * The meta object literal for the '<em><b>Always Canonical IDs</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS = eINSTANCE.getAbstractDynamicCanonicalContainer_AlwaysCanonicalIDs();
-
- /**
- * The meta object literal for the '<em><b>Initially Canonical</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL = eINSTANCE.getAbstractDynamicCanonicalContainer_InitiallyCanonical();
-
- /**
- * The meta object literal for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.DynamicCanonicalCompartmentImpl <em>Dynamic Canonical Compartment</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.DynamicCanonicalCompartmentImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getDynamicCanonicalCompartment()
- * @generated
- */
- EClass DYNAMIC_CANONICAL_COMPARTMENT = eINSTANCE.getDynamicCanonicalCompartment();
-
- /**
- * The meta object literal for the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.InteractionDiagramAttributesImpl <em>Interaction Diagram Attributes</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.InteractionDiagramAttributesImpl
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.impl.GMFGenExtPackageImpl#getInteractionDiagramAttributes()
- * @generated
- */
- EClass INTERACTION_DIAGRAM_ATTRIBUTES = eINSTANCE.getInteractionDiagramAttributes();
-
- /**
- * The meta object literal for the '<em><b>Multi Layered</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EAttribute INTERACTION_DIAGRAM_ATTRIBUTES__MULTI_LAYERED = eINSTANCE.getInteractionDiagramAttributes_MultiLayered();
-
- }
-
-} //GMFGenExtPackage
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/InteractionDiagramAttributes.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/InteractionDiagramAttributes.java
deleted file mode 100644
index 6a4c37e..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/InteractionDiagramAttributes.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: InteractionDiagramAttributes.java,v 1.1 2008/05/07 17:42:26 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext;
-
-import org.eclipse.gmf.codegen.gmfgen.Attributes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interaction Diagram Attributes</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes#isMultiLayered <em>Multi Layered</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getInteractionDiagramAttributes()
- * @model
- * @generated
- */
-public interface InteractionDiagramAttributes extends Attributes {
- /**
- * Returns the value of the '<em><b>Multi Layered</b></em>' attribute.
- * The default value is <code>"true"</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Applicable for gmfgen::GenNode. This node is responcible for distribution of its children's figures between different layers.
- * <!-- end-model-doc -->
- * @return the value of the '<em>Multi Layered</em>' attribute.
- * @see #setMultiLayered(boolean)
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getInteractionDiagramAttributes_MultiLayered()
- * @model default="true"
- * @generated
- */
- boolean isMultiLayered();
-
- /**
- * Sets the value of the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes#isMultiLayered <em>Multi Layered</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Multi Layered</em>' attribute.
- * @see #isMultiLayered()
- * @generated
- */
- void setMultiLayered(boolean value);
-
-} // InteractionDiagramAttributes
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/SubstitutableByAttributes.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/SubstitutableByAttributes.java
deleted file mode 100644
index b772117..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/SubstitutableByAttributes.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SubstitutableByAttributes.java,v 1.3 2007/11/22 16:59:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.gmf.codegen.gmfgen.Attributes;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Substitutable By Attributes</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes#getSubstitutableByIDs <em>Substitutable By IDs</em>}</li>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes#isRequiresAll <em>Requires All</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getSubstitutableByAttributes()
- * @model
- * @generated
- */
-public interface SubstitutableByAttributes extends Attributes {
- /**
- * Returns the value of the '<em><b>Substitutable By IDs</b></em>' attribute list.
- * The list contents are of type {@link java.lang.Integer}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Allows to have different notation for same semantic element. Diagram updater should choose some default notation, but should treat any of the substitutable nodes as correct representation for given semantic element
- * <!-- end-model-doc -->
- * @return the value of the '<em>Substitutable By IDs</em>' attribute list.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getSubstitutableByAttributes_SubstitutableByIDs()
- * @model
- * @generated
- */
- EList getSubstitutableByIDs();
-
- /**
- * Returns the value of the '<em><b>Requires All</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Requires All</em>' attribute isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Requires All</em>' attribute.
- * @see #setRequiresAll(boolean)
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#getSubstitutableByAttributes_RequiresAll()
- * @model
- * @generated
- */
- boolean isRequiresAll();
-
- /**
- * Sets the value of the '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes#isRequiresAll <em>Requires All</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Requires All</em>' attribute.
- * @see #isRequiresAll()
- * @generated
- */
- void setRequiresAll(boolean value);
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @model kind="operation" type="org.eclipse.gmf.codegen.gmfgen.GenCommonBase"
- * @generated
- */
- EList getSubstitutableByNodes();
-
-} // SubstitutableByAttributes
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/AbstractDynamicCanonicalContainerImpl.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/AbstractDynamicCanonicalContainerImpl.java
deleted file mode 100644
index 7f78627..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/AbstractDynamicCanonicalContainerImpl.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AbstractDynamicCanonicalContainerImpl.java,v 1.1 2008/05/07 17:36:56 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Dynamic Canonical Container</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.AbstractDynamicCanonicalContainerImpl#getAlwaysCanonicalIDs <em>Always Canonical IDs</em>}</li>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.AbstractDynamicCanonicalContainerImpl#isInitiallyCanonical <em>Initially Canonical</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class AbstractDynamicCanonicalContainerImpl extends EObjectImpl implements AbstractDynamicCanonicalContainer {
- /**
- * The cached value of the '{@link #getAlwaysCanonicalIDs() <em>Always Canonical IDs</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getAlwaysCanonicalIDs()
- * @generated
- * @ordered
- */
- protected EList alwaysCanonicalIDs;
-
- /**
- * The default value of the '{@link #isInitiallyCanonical() <em>Initially Canonical</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isInitiallyCanonical()
- * @generated
- * @ordered
- */
- protected static final boolean INITIALLY_CANONICAL_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isInitiallyCanonical() <em>Initially Canonical</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isInitiallyCanonical()
- * @generated
- * @ordered
- */
- protected boolean initiallyCanonical = INITIALLY_CANONICAL_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected AbstractDynamicCanonicalContainerImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return GMFGenExtPackage.Literals.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getAlwaysCanonicalIDs() {
- if (alwaysCanonicalIDs == null) {
- alwaysCanonicalIDs = new EDataTypeUniqueEList(Integer.class, this, GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS);
- }
- return alwaysCanonicalIDs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isInitiallyCanonical() {
- return initiallyCanonical;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setInitiallyCanonical(boolean newInitiallyCanonical) {
- boolean oldInitiallyCanonical = initiallyCanonical;
- initiallyCanonical = newInitiallyCanonical;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL, oldInitiallyCanonical, initiallyCanonical));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getAlwaysCanonicalChildren() {
- // TODO: implement this method
- // Ensure that you remove @generated or mark it @generated NOT
- throw new UnsupportedOperationException();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS:
- return getAlwaysCanonicalIDs();
- case GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL:
- return isInitiallyCanonical() ? 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 GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS:
- getAlwaysCanonicalIDs().clear();
- getAlwaysCanonicalIDs().addAll((Collection)newValue);
- return;
- case GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL:
- setInitiallyCanonical(((Boolean)newValue).booleanValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS:
- getAlwaysCanonicalIDs().clear();
- return;
- case GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL:
- setInitiallyCanonical(INITIALLY_CANONICAL_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS:
- return alwaysCanonicalIDs != null && !alwaysCanonicalIDs.isEmpty();
- case GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL:
- return initiallyCanonical != INITIALLY_CANONICAL_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(" (alwaysCanonicalIDs: ");
- result.append(alwaysCanonicalIDs);
- result.append(", initiallyCanonical: ");
- result.append(initiallyCanonical);
- result.append(')');
- return result.toString();
- }
-
-} //AbstractDynamicCanonicalContainerImpl
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/AuxSecondaryDiagramNodeAttributeImpl.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/AuxSecondaryDiagramNodeAttributeImpl.java
deleted file mode 100644
index e239c1c..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/AuxSecondaryDiagramNodeAttributeImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AuxSecondaryDiagramNodeAttributeImpl.java,v 1.2 2007/11/22 16:59:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Aux Secondary Diagram Node Attribute</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.AuxSecondaryDiagramNodeAttributeImpl#isSubstituteWithCanvasElement <em>Substitute With Canvas Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AuxSecondaryDiagramNodeAttributeImpl extends EObjectImpl implements AuxSecondaryDiagramNodeAttribute {
- /**
- * The default value of the '{@link #isSubstituteWithCanvasElement() <em>Substitute With Canvas Element</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSubstituteWithCanvasElement()
- * @generated
- * @ordered
- */
- protected static final boolean SUBSTITUTE_WITH_CANVAS_ELEMENT_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isSubstituteWithCanvasElement() <em>Substitute With Canvas Element</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isSubstituteWithCanvasElement()
- * @generated
- * @ordered
- */
- protected boolean substituteWithCanvasElement = SUBSTITUTE_WITH_CANVAS_ELEMENT_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected AuxSecondaryDiagramNodeAttributeImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return GMFGenExtPackage.Literals.AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isSubstituteWithCanvasElement() {
- return substituteWithCanvasElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSubstituteWithCanvasElement(boolean newSubstituteWithCanvasElement) {
- boolean oldSubstituteWithCanvasElement = substituteWithCanvasElement;
- substituteWithCanvasElement = newSubstituteWithCanvasElement;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenExtPackage.AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE__SUBSTITUTE_WITH_CANVAS_ELEMENT, oldSubstituteWithCanvasElement, substituteWithCanvasElement));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case GMFGenExtPackage.AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE__SUBSTITUTE_WITH_CANVAS_ELEMENT:
- return isSubstituteWithCanvasElement() ? 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 GMFGenExtPackage.AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE__SUBSTITUTE_WITH_CANVAS_ELEMENT:
- setSubstituteWithCanvasElement(((Boolean)newValue).booleanValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE__SUBSTITUTE_WITH_CANVAS_ELEMENT:
- setSubstituteWithCanvasElement(SUBSTITUTE_WITH_CANVAS_ELEMENT_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE__SUBSTITUTE_WITH_CANVAS_ELEMENT:
- return substituteWithCanvasElement != SUBSTITUTE_WITH_CANVAS_ELEMENT_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(" (substituteWithCanvasElement: ");
- result.append(substituteWithCanvasElement);
- result.append(')');
- return result.toString();
- }
-
-} //AuxSecondaryDiagramNodeAttributeImpl
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/CustomLocatorAttributesImpl.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/CustomLocatorAttributesImpl.java
deleted file mode 100644
index a323cad..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/CustomLocatorAttributesImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CustomLocatorAttributesImpl.java,v 1.2 2007/11/22 16:59:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Locator Attributes</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.CustomLocatorAttributesImpl#getCustomLocatorFQN <em>Custom Locator FQN</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CustomLocatorAttributesImpl extends EObjectImpl implements CustomLocatorAttributes {
- /**
- * The default value of the '{@link #getCustomLocatorFQN() <em>Custom Locator FQN</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCustomLocatorFQN()
- * @generated
- * @ordered
- */
- protected static final String CUSTOM_LOCATOR_FQN_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getCustomLocatorFQN() <em>Custom Locator FQN</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getCustomLocatorFQN()
- * @generated
- * @ordered
- */
- protected String customLocatorFQN = CUSTOM_LOCATOR_FQN_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected CustomLocatorAttributesImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return GMFGenExtPackage.Literals.CUSTOM_LOCATOR_ATTRIBUTES;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getCustomLocatorFQN() {
- return customLocatorFQN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setCustomLocatorFQN(String newCustomLocatorFQN) {
- String oldCustomLocatorFQN = customLocatorFQN;
- customLocatorFQN = newCustomLocatorFQN;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenExtPackage.CUSTOM_LOCATOR_ATTRIBUTES__CUSTOM_LOCATOR_FQN, oldCustomLocatorFQN, customLocatorFQN));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case GMFGenExtPackage.CUSTOM_LOCATOR_ATTRIBUTES__CUSTOM_LOCATOR_FQN:
- return getCustomLocatorFQN();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case GMFGenExtPackage.CUSTOM_LOCATOR_ATTRIBUTES__CUSTOM_LOCATOR_FQN:
- setCustomLocatorFQN((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.CUSTOM_LOCATOR_ATTRIBUTES__CUSTOM_LOCATOR_FQN:
- setCustomLocatorFQN(CUSTOM_LOCATOR_FQN_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.CUSTOM_LOCATOR_ATTRIBUTES__CUSTOM_LOCATOR_FQN:
- return CUSTOM_LOCATOR_FQN_EDEFAULT == null ? customLocatorFQN != null : !CUSTOM_LOCATOR_FQN_EDEFAULT.equals(customLocatorFQN);
- }
- 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(" (customLocatorFQN: ");
- result.append(customLocatorFQN);
- result.append(')');
- return result.toString();
- }
-
-} //CustomLocatorAttributesImpl
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/DetailsLevelAttributesImpl.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/DetailsLevelAttributesImpl.java
deleted file mode 100644
index 9f09a53..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/DetailsLevelAttributesImpl.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DetailsLevelAttributesImpl.java,v 1.2 2007/11/22 16:59:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Details Level Attributes</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.DetailsLevelAttributesImpl#isFilteringCompartment <em>Filtering Compartment</em>}</li>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.DetailsLevelAttributesImpl#isDetailsAwareParser <em>Details Aware Parser</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DetailsLevelAttributesImpl extends EObjectImpl implements DetailsLevelAttributes {
- /**
- * The default value of the '{@link #isFilteringCompartment() <em>Filtering Compartment</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFilteringCompartment()
- * @generated
- * @ordered
- */
- protected static final boolean FILTERING_COMPARTMENT_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isFilteringCompartment() <em>Filtering Compartment</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isFilteringCompartment()
- * @generated
- * @ordered
- */
- protected boolean filteringCompartment = FILTERING_COMPARTMENT_EDEFAULT;
-
- /**
- * The default value of the '{@link #isDetailsAwareParser() <em>Details Aware Parser</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isDetailsAwareParser()
- * @generated
- * @ordered
- */
- protected static final boolean DETAILS_AWARE_PARSER_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isDetailsAwareParser() <em>Details Aware Parser</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isDetailsAwareParser()
- * @generated
- * @ordered
- */
- protected boolean detailsAwareParser = DETAILS_AWARE_PARSER_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DetailsLevelAttributesImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return GMFGenExtPackage.Literals.DETAILS_LEVEL_ATTRIBUTES;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isFilteringCompartment() {
- return filteringCompartment;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setFilteringCompartment(boolean newFilteringCompartment) {
- boolean oldFilteringCompartment = filteringCompartment;
- filteringCompartment = newFilteringCompartment;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__FILTERING_COMPARTMENT, oldFilteringCompartment, filteringCompartment));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isDetailsAwareParser() {
- return detailsAwareParser;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setDetailsAwareParser(boolean newDetailsAwareParser) {
- boolean oldDetailsAwareParser = detailsAwareParser;
- detailsAwareParser = newDetailsAwareParser;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__DETAILS_AWARE_PARSER, oldDetailsAwareParser, detailsAwareParser));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__FILTERING_COMPARTMENT:
- return isFilteringCompartment() ? Boolean.TRUE : Boolean.FALSE;
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__DETAILS_AWARE_PARSER:
- return isDetailsAwareParser() ? 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 GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__FILTERING_COMPARTMENT:
- setFilteringCompartment(((Boolean)newValue).booleanValue());
- return;
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__DETAILS_AWARE_PARSER:
- setDetailsAwareParser(((Boolean)newValue).booleanValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__FILTERING_COMPARTMENT:
- setFilteringCompartment(FILTERING_COMPARTMENT_EDEFAULT);
- return;
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__DETAILS_AWARE_PARSER:
- setDetailsAwareParser(DETAILS_AWARE_PARSER_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__FILTERING_COMPARTMENT:
- return filteringCompartment != FILTERING_COMPARTMENT_EDEFAULT;
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES__DETAILS_AWARE_PARSER:
- return detailsAwareParser != DETAILS_AWARE_PARSER_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(" (filteringCompartment: ");
- result.append(filteringCompartment);
- result.append(", detailsAwareParser: ");
- result.append(detailsAwareParser);
- result.append(')');
- return result.toString();
- }
-
-} //DetailsLevelAttributesImpl
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/DynamicCanonicalCompartmentImpl.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/DynamicCanonicalCompartmentImpl.java
deleted file mode 100644
index fa69cfb..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/DynamicCanonicalCompartmentImpl.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DynamicCanonicalCompartmentImpl.java,v 1.1 2008/05/07 17:36:56 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.impl;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dynamic Canonical Compartment</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DynamicCanonicalCompartmentImpl extends AbstractDynamicCanonicalContainerImpl implements DynamicCanonicalCompartment {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DynamicCanonicalCompartmentImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return GMFGenExtPackage.Literals.DYNAMIC_CANONICAL_COMPARTMENT;
- }
-
-} //DynamicCanonicalCompartmentImpl
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/GMFGenExtFactoryImpl.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/GMFGenExtFactoryImpl.java
deleted file mode 100644
index 2de9c2e..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/GMFGenExtFactoryImpl.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GMFGenExtFactoryImpl.java,v 1.4 2008/05/07 17:37:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.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.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtFactory;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFGenExtFactoryImpl extends EFactoryImpl implements GMFGenExtFactory {
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static GMFGenExtFactory init() {
- try {
- GMFGenExtFactory theGMFGenExtFactory = (GMFGenExtFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/uml2/diagram/gmfgenext/DiagramFigure/1.0");
- if (theGMFGenExtFactory != null) {
- return theGMFGenExtFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new GMFGenExtFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public GMFGenExtFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case GMFGenExtPackage.AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE: return createAuxSecondaryDiagramNodeAttribute();
- case GMFGenExtPackage.CUSTOM_LOCATOR_ATTRIBUTES: return createCustomLocatorAttributes();
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES: return createDetailsLevelAttributes();
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES: return createSubstitutableByAttributes();
- case GMFGenExtPackage.DYNAMIC_CANONICAL_COMPARTMENT: return createDynamicCanonicalCompartment();
- case GMFGenExtPackage.INTERACTION_DIAGRAM_ATTRIBUTES: return createInteractionDiagramAttributes();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public AuxSecondaryDiagramNodeAttribute createAuxSecondaryDiagramNodeAttribute() {
- AuxSecondaryDiagramNodeAttributeImpl auxSecondaryDiagramNodeAttribute = new AuxSecondaryDiagramNodeAttributeImpl();
- return auxSecondaryDiagramNodeAttribute;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public CustomLocatorAttributes createCustomLocatorAttributes() {
- CustomLocatorAttributesImpl customLocatorAttributes = new CustomLocatorAttributesImpl();
- return customLocatorAttributes;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DetailsLevelAttributes createDetailsLevelAttributes() {
- DetailsLevelAttributesImpl detailsLevelAttributes = new DetailsLevelAttributesImpl();
- return detailsLevelAttributes;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SubstitutableByAttributes createSubstitutableByAttributes() {
- SubstitutableByAttributesImpl substitutableByAttributes = new SubstitutableByAttributesImpl();
- return substitutableByAttributes;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DynamicCanonicalCompartment createDynamicCanonicalCompartment() {
- DynamicCanonicalCompartmentImpl dynamicCanonicalCompartment = new DynamicCanonicalCompartmentImpl();
- return dynamicCanonicalCompartment;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public InteractionDiagramAttributes createInteractionDiagramAttributes() {
- InteractionDiagramAttributesImpl interactionDiagramAttributes = new InteractionDiagramAttributesImpl();
- return interactionDiagramAttributes;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public GMFGenExtPackage getGMFGenExtPackage() {
- return (GMFGenExtPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- public static GMFGenExtPackage getPackage() {
- return GMFGenExtPackage.eINSTANCE;
- }
-
-} //GMFGenExtFactoryImpl
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/GMFGenExtPackageImpl.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/GMFGenExtPackageImpl.java
deleted file mode 100644
index 693b2dc..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/GMFGenExtPackageImpl.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GMFGenExtPackageImpl.java,v 1.6 2008/05/07 17:37:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtFactory;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFGenExtPackageImpl extends EPackageImpl implements GMFGenExtPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass auxSecondaryDiagramNodeAttributeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass customLocatorAttributesEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass detailsLevelAttributesEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass substitutableByAttributesEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass abstractDynamicCanonicalContainerEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass dynamicCanonicalCompartmentEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass interactionDiagramAttributesEClass = 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.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private GMFGenExtPackageImpl() {
- super(eNS_URI, GMFGenExtFactory.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 GMFGenExtPackage init() {
- if (isInited) return (GMFGenExtPackage)EPackage.Registry.INSTANCE.getEPackage(GMFGenExtPackage.eNS_URI);
-
- // Obtain or create and register package
- GMFGenExtPackageImpl theGMFGenExtPackage = (GMFGenExtPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof GMFGenExtPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new GMFGenExtPackageImpl());
-
- isInited = true;
-
- // Initialize simple dependencies
- GMFGenPackage.eINSTANCE.eClass();
-
- // Create package meta-data objects
- theGMFGenExtPackage.createPackageContents();
-
- // Initialize created meta-data
- theGMFGenExtPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theGMFGenExtPackage.freeze();
-
- return theGMFGenExtPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getAuxSecondaryDiagramNodeAttribute() {
- return auxSecondaryDiagramNodeAttributeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getAuxSecondaryDiagramNodeAttribute_SubstituteWithCanvasElement() {
- return (EAttribute)auxSecondaryDiagramNodeAttributeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getCustomLocatorAttributes() {
- return customLocatorAttributesEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getCustomLocatorAttributes_CustomLocatorFQN() {
- return (EAttribute)customLocatorAttributesEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getDetailsLevelAttributes() {
- return detailsLevelAttributesEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getDetailsLevelAttributes_FilteringCompartment() {
- return (EAttribute)detailsLevelAttributesEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getDetailsLevelAttributes_DetailsAwareParser() {
- return (EAttribute)detailsLevelAttributesEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getSubstitutableByAttributes() {
- return substitutableByAttributesEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getSubstitutableByAttributes_SubstitutableByIDs() {
- return (EAttribute)substitutableByAttributesEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getSubstitutableByAttributes_RequiresAll() {
- return (EAttribute)substitutableByAttributesEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getAbstractDynamicCanonicalContainer() {
- return abstractDynamicCanonicalContainerEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getAbstractDynamicCanonicalContainer_AlwaysCanonicalIDs() {
- return (EAttribute)abstractDynamicCanonicalContainerEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getAbstractDynamicCanonicalContainer_InitiallyCanonical() {
- return (EAttribute)abstractDynamicCanonicalContainerEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getDynamicCanonicalCompartment() {
- return dynamicCanonicalCompartmentEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getInteractionDiagramAttributes() {
- return interactionDiagramAttributesEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getInteractionDiagramAttributes_MultiLayered() {
- return (EAttribute)interactionDiagramAttributesEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public GMFGenExtFactory getGMFGenExtFactory() {
- return (GMFGenExtFactory)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
- auxSecondaryDiagramNodeAttributeEClass = createEClass(AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE);
- createEAttribute(auxSecondaryDiagramNodeAttributeEClass, AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE__SUBSTITUTE_WITH_CANVAS_ELEMENT);
-
- customLocatorAttributesEClass = createEClass(CUSTOM_LOCATOR_ATTRIBUTES);
- createEAttribute(customLocatorAttributesEClass, CUSTOM_LOCATOR_ATTRIBUTES__CUSTOM_LOCATOR_FQN);
-
- detailsLevelAttributesEClass = createEClass(DETAILS_LEVEL_ATTRIBUTES);
- createEAttribute(detailsLevelAttributesEClass, DETAILS_LEVEL_ATTRIBUTES__FILTERING_COMPARTMENT);
- createEAttribute(detailsLevelAttributesEClass, DETAILS_LEVEL_ATTRIBUTES__DETAILS_AWARE_PARSER);
-
- substitutableByAttributesEClass = createEClass(SUBSTITUTABLE_BY_ATTRIBUTES);
- createEAttribute(substitutableByAttributesEClass, SUBSTITUTABLE_BY_ATTRIBUTES__SUBSTITUTABLE_BY_IDS);
- createEAttribute(substitutableByAttributesEClass, SUBSTITUTABLE_BY_ATTRIBUTES__REQUIRES_ALL);
-
- abstractDynamicCanonicalContainerEClass = createEClass(ABSTRACT_DYNAMIC_CANONICAL_CONTAINER);
- createEAttribute(abstractDynamicCanonicalContainerEClass, ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__ALWAYS_CANONICAL_IDS);
- createEAttribute(abstractDynamicCanonicalContainerEClass, ABSTRACT_DYNAMIC_CANONICAL_CONTAINER__INITIALLY_CANONICAL);
-
- dynamicCanonicalCompartmentEClass = createEClass(DYNAMIC_CANONICAL_COMPARTMENT);
-
- interactionDiagramAttributesEClass = createEClass(INTERACTION_DIAGRAM_ATTRIBUTES);
- createEAttribute(interactionDiagramAttributesEClass, INTERACTION_DIAGRAM_ATTRIBUTES__MULTI_LAYERED);
- }
-
- /**
- * <!-- 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);
-
- // Obtain other dependent packages
- GMFGenPackage theGMFGenPackage = (GMFGenPackage)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI);
-
- // Add supertypes to classes
- auxSecondaryDiagramNodeAttributeEClass.getESuperTypes().add(theGMFGenPackage.getAttributes());
- customLocatorAttributesEClass.getESuperTypes().add(theGMFGenPackage.getAttributes());
- detailsLevelAttributesEClass.getESuperTypes().add(theGMFGenPackage.getAttributes());
- substitutableByAttributesEClass.getESuperTypes().add(theGMFGenPackage.getAttributes());
- abstractDynamicCanonicalContainerEClass.getESuperTypes().add(theGMFGenPackage.getAttributes());
- dynamicCanonicalCompartmentEClass.getESuperTypes().add(this.getAbstractDynamicCanonicalContainer());
- interactionDiagramAttributesEClass.getESuperTypes().add(theGMFGenPackage.getAttributes());
-
- // Initialize classes and features; add operations and parameters
- initEClass(auxSecondaryDiagramNodeAttributeEClass, AuxSecondaryDiagramNodeAttribute.class, "AuxSecondaryDiagramNodeAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getAuxSecondaryDiagramNodeAttribute_SubstituteWithCanvasElement(), ecorePackage.getEBoolean(), "substituteWithCanvasElement", null, 0, 1, AuxSecondaryDiagramNodeAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(customLocatorAttributesEClass, CustomLocatorAttributes.class, "CustomLocatorAttributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getCustomLocatorAttributes_CustomLocatorFQN(), ecorePackage.getEString(), "customLocatorFQN", null, 0, 1, CustomLocatorAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(detailsLevelAttributesEClass, DetailsLevelAttributes.class, "DetailsLevelAttributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getDetailsLevelAttributes_FilteringCompartment(), ecorePackage.getEBoolean(), "filteringCompartment", null, 0, 1, DetailsLevelAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getDetailsLevelAttributes_DetailsAwareParser(), ecorePackage.getEBoolean(), "detailsAwareParser", null, 0, 1, DetailsLevelAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(substitutableByAttributesEClass, SubstitutableByAttributes.class, "SubstitutableByAttributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getSubstitutableByAttributes_SubstitutableByIDs(), ecorePackage.getEInt(), "substitutableByIDs", null, 0, -1, SubstitutableByAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getSubstitutableByAttributes_RequiresAll(), ecorePackage.getEBoolean(), "requiresAll", null, 0, 1, SubstitutableByAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- addEOperation(substitutableByAttributesEClass, theGMFGenPackage.getGenCommonBase(), "getSubstitutableByNodes", 0, -1);
-
- initEClass(abstractDynamicCanonicalContainerEClass, AbstractDynamicCanonicalContainer.class, "AbstractDynamicCanonicalContainer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getAbstractDynamicCanonicalContainer_AlwaysCanonicalIDs(), ecorePackage.getEInt(), "alwaysCanonicalIDs", null, 0, -1, AbstractDynamicCanonicalContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getAbstractDynamicCanonicalContainer_InitiallyCanonical(), ecorePackage.getEBoolean(), "initiallyCanonical", "false", 0, 1, AbstractDynamicCanonicalContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- addEOperation(abstractDynamicCanonicalContainerEClass, theGMFGenPackage.getGenCommonBase(), "getAlwaysCanonicalChildren", 0, -1);
-
- initEClass(dynamicCanonicalCompartmentEClass, DynamicCanonicalCompartment.class, "DynamicCanonicalCompartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(interactionDiagramAttributesEClass, InteractionDiagramAttributes.class, "InteractionDiagramAttributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getInteractionDiagramAttributes_MultiLayered(), ecorePackage.getEBoolean(), "multiLayered", "true", 0, 1, InteractionDiagramAttributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //GMFGenExtPackageImpl
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/InteractionDiagramAttributesImpl.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/InteractionDiagramAttributesImpl.java
deleted file mode 100644
index 0edffe2..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/InteractionDiagramAttributesImpl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: InteractionDiagramAttributesImpl.java,v 1.1 2008/05/07 17:42:26 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Interaction Diagram Attributes</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.InteractionDiagramAttributesImpl#isMultiLayered <em>Multi Layered</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InteractionDiagramAttributesImpl extends EObjectImpl implements InteractionDiagramAttributes {
- /**
- * The default value of the '{@link #isMultiLayered() <em>Multi Layered</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMultiLayered()
- * @generated
- * @ordered
- */
- protected static final boolean MULTI_LAYERED_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isMultiLayered() <em>Multi Layered</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isMultiLayered()
- * @generated
- * @ordered
- */
- protected boolean multiLayered = MULTI_LAYERED_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected InteractionDiagramAttributesImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return GMFGenExtPackage.Literals.INTERACTION_DIAGRAM_ATTRIBUTES;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isMultiLayered() {
- return multiLayered;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMultiLayered(boolean newMultiLayered) {
- boolean oldMultiLayered = multiLayered;
- multiLayered = newMultiLayered;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenExtPackage.INTERACTION_DIAGRAM_ATTRIBUTES__MULTI_LAYERED, oldMultiLayered, multiLayered));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case GMFGenExtPackage.INTERACTION_DIAGRAM_ATTRIBUTES__MULTI_LAYERED:
- return isMultiLayered() ? 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 GMFGenExtPackage.INTERACTION_DIAGRAM_ATTRIBUTES__MULTI_LAYERED:
- setMultiLayered(((Boolean)newValue).booleanValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.INTERACTION_DIAGRAM_ATTRIBUTES__MULTI_LAYERED:
- setMultiLayered(MULTI_LAYERED_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.INTERACTION_DIAGRAM_ATTRIBUTES__MULTI_LAYERED:
- return multiLayered != MULTI_LAYERED_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(" (multiLayered: ");
- result.append(multiLayered);
- result.append(')');
- return result.toString();
- }
-
-} //InteractionDiagramAttributesImpl
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/SubstitutableByAttributesImpl.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/SubstitutableByAttributesImpl.java
deleted file mode 100644
index 63bbc77..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/impl/SubstitutableByAttributesImpl.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SubstitutableByAttributesImpl.java,v 1.4 2008/05/07 17:38:05 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.gmf.codegen.gmfgen.GenCommonBase;
-import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Substitutable By Attributes</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.SubstitutableByAttributesImpl#getSubstitutableByIDs <em>Substitutable By IDs</em>}</li>
- * <li>{@link org.eclipse.uml2.diagram.codegen.gmfgenext.impl.SubstitutableByAttributesImpl#isRequiresAll <em>Requires All</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SubstitutableByAttributesImpl extends EObjectImpl implements SubstitutableByAttributes {
- /**
- * The cached value of the '{@link #getSubstitutableByIDs() <em>Substitutable By IDs</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSubstitutableByIDs()
- * @generated
- * @ordered
- */
- protected EList substitutableByIDs;
-
- /**
- * The default value of the '{@link #isRequiresAll() <em>Requires All</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isRequiresAll()
- * @generated
- * @ordered
- */
- protected static final boolean REQUIRES_ALL_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isRequiresAll() <em>Requires All</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isRequiresAll()
- * @generated
- * @ordered
- */
- protected boolean requiresAll = REQUIRES_ALL_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SubstitutableByAttributesImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return GMFGenExtPackage.Literals.SUBSTITUTABLE_BY_ATTRIBUTES;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getSubstitutableByIDs() {
- if (substitutableByIDs == null) {
- substitutableByIDs = new EDataTypeUniqueEList(Integer.class, this, GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__SUBSTITUTABLE_BY_IDS);
- }
- return substitutableByIDs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isRequiresAll() {
- return requiresAll;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRequiresAll(boolean newRequiresAll) {
- boolean oldRequiresAll = requiresAll;
- requiresAll = newRequiresAll;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__REQUIRES_ALL, oldRequiresAll, requiresAll));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getSubstitutableByNodes() {
- EList<GenCommonBase> result = new BasicEList<GenCommonBase>();
- if (getSubstitutableByIDs().isEmpty()){
- return result;
- }
-
- GenDiagram diagram = findDiagram();
- if (diagram == null){
- return result;
- }
-
- HashMap<Integer, GenNode> nodesMap = new HashMap<Integer, GenNode>();
- for (GenNode next : diagram.getAllNodes()){
- nodesMap.put(next.getVisualID(), next);
- }
-
- for (Object next : getSubstitutableByIDs()){
- Integer nextId = (Integer)next;
- GenNode nextNode = nodesMap.get(nextId);
- if (nextNode != null){
- result.add(nextNode);
- }
- }
- return result;
- }
-
- private GenDiagram findDiagram() {
- EObject next = this;
- while(next != null && false == next instanceof GenDiagram){
- next = next.eContainer();
- }
- return (GenDiagram)next;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__SUBSTITUTABLE_BY_IDS:
- return getSubstitutableByIDs();
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__REQUIRES_ALL:
- return isRequiresAll() ? 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 GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__SUBSTITUTABLE_BY_IDS:
- getSubstitutableByIDs().clear();
- getSubstitutableByIDs().addAll((Collection)newValue);
- return;
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__REQUIRES_ALL:
- setRequiresAll(((Boolean)newValue).booleanValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__SUBSTITUTABLE_BY_IDS:
- getSubstitutableByIDs().clear();
- return;
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__REQUIRES_ALL:
- setRequiresAll(REQUIRES_ALL_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__SUBSTITUTABLE_BY_IDS:
- return substitutableByIDs != null && !substitutableByIDs.isEmpty();
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES__REQUIRES_ALL:
- return requiresAll != REQUIRES_ALL_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(" (substitutableByIDs: ");
- result.append(substitutableByIDs);
- result.append(", requiresAll: ");
- result.append(requiresAll);
- result.append(')');
- return result.toString();
- }
-
-} //SubstitutableByAttributesImpl
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/util/GMFGenExtAdapterFactory.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/util/GMFGenExtAdapterFactory.java
deleted file mode 100644
index a64d2fd..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/util/GMFGenExtAdapterFactory.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GMFGenExtAdapterFactory.java,v 1.5 2008/05/07 17:37:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.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.codegen.gmfgen.Attributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes;
-
-/**
- * <!-- 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.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage
- * @generated
- */
-public class GMFGenExtAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static GMFGenExtPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public GMFGenExtAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = GMFGenExtPackage.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 that delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected GMFGenExtSwitch modelSwitch =
- new GMFGenExtSwitch() {
- public Object caseAuxSecondaryDiagramNodeAttribute(AuxSecondaryDiagramNodeAttribute object) {
- return createAuxSecondaryDiagramNodeAttributeAdapter();
- }
- public Object caseCustomLocatorAttributes(CustomLocatorAttributes object) {
- return createCustomLocatorAttributesAdapter();
- }
- public Object caseDetailsLevelAttributes(DetailsLevelAttributes object) {
- return createDetailsLevelAttributesAdapter();
- }
- public Object caseSubstitutableByAttributes(SubstitutableByAttributes object) {
- return createSubstitutableByAttributesAdapter();
- }
- public Object caseAbstractDynamicCanonicalContainer(AbstractDynamicCanonicalContainer object) {
- return createAbstractDynamicCanonicalContainerAdapter();
- }
- public Object caseDynamicCanonicalCompartment(DynamicCanonicalCompartment object) {
- return createDynamicCanonicalCompartmentAdapter();
- }
- public Object caseInteractionDiagramAttributes(InteractionDiagramAttributes object) {
- return createInteractionDiagramAttributesAdapter();
- }
- public Object caseAttributes(Attributes object) {
- return createAttributesAdapter();
- }
- 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.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute <em>Aux Secondary Diagram Node Attribute</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.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute
- * @generated
- */
- public Adapter createAuxSecondaryDiagramNodeAttributeAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes <em>Custom Locator Attributes</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.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes
- * @generated
- */
- public Adapter createCustomLocatorAttributesAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes <em>Details Level Attributes</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.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes
- * @generated
- */
- public Adapter createDetailsLevelAttributesAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes <em>Substitutable By Attributes</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.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes
- * @generated
- */
- public Adapter createSubstitutableByAttributesAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer <em>Abstract Dynamic Canonical 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.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer
- * @generated
- */
- public Adapter createAbstractDynamicCanonicalContainerAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment <em>Dynamic Canonical Compartment</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment
- * @generated
- */
- public Adapter createDynamicCanonicalCompartmentAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes <em>Interaction Diagram Attributes</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.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes
- * @generated
- */
- public Adapter createInteractionDiagramAttributesAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.gmf.codegen.gmfgen.Attributes <em>Attributes</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.codegen.gmfgen.Attributes
- * @generated
- */
- public Adapter createAttributesAdapter() {
- 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;
- }
-
-} //GMFGenExtAdapterFactory
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/util/GMFGenExtSwitch.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/util/GMFGenExtSwitch.java
deleted file mode 100644
index 7fa0705..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/gmfgenext/util/GMFGenExtSwitch.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: GMFGenExtSwitch.java,v 1.4 2008/05/07 17:37:33 mgolubev Exp $
- */
-package org.eclipse.uml2.diagram.codegen.gmfgenext.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.codegen.gmfgen.Attributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.AbstractDynamicCanonicalContainer;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.AuxSecondaryDiagramNodeAttribute;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.CustomLocatorAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DetailsLevelAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.DynamicCanonicalCompartment;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.InteractionDiagramAttributes;
-import org.eclipse.uml2.diagram.codegen.gmfgenext.SubstitutableByAttributes;
-
-/**
- * <!-- 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.uml2.diagram.codegen.gmfgenext.GMFGenExtPackage
- * @generated
- */
-public class GMFGenExtSwitch {
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static GMFGenExtPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public GMFGenExtSwitch() {
- if (modelPackage == null) {
- modelPackage = GMFGenExtPackage.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 GMFGenExtPackage.AUX_SECONDARY_DIAGRAM_NODE_ATTRIBUTE: {
- AuxSecondaryDiagramNodeAttribute auxSecondaryDiagramNodeAttribute = (AuxSecondaryDiagramNodeAttribute)theEObject;
- Object result = caseAuxSecondaryDiagramNodeAttribute(auxSecondaryDiagramNodeAttribute);
- if (result == null) result = caseAttributes(auxSecondaryDiagramNodeAttribute);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case GMFGenExtPackage.CUSTOM_LOCATOR_ATTRIBUTES: {
- CustomLocatorAttributes customLocatorAttributes = (CustomLocatorAttributes)theEObject;
- Object result = caseCustomLocatorAttributes(customLocatorAttributes);
- if (result == null) result = caseAttributes(customLocatorAttributes);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case GMFGenExtPackage.DETAILS_LEVEL_ATTRIBUTES: {
- DetailsLevelAttributes detailsLevelAttributes = (DetailsLevelAttributes)theEObject;
- Object result = caseDetailsLevelAttributes(detailsLevelAttributes);
- if (result == null) result = caseAttributes(detailsLevelAttributes);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case GMFGenExtPackage.SUBSTITUTABLE_BY_ATTRIBUTES: {
- SubstitutableByAttributes substitutableByAttributes = (SubstitutableByAttributes)theEObject;
- Object result = caseSubstitutableByAttributes(substitutableByAttributes);
- if (result == null) result = caseAttributes(substitutableByAttributes);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case GMFGenExtPackage.ABSTRACT_DYNAMIC_CANONICAL_CONTAINER: {
- AbstractDynamicCanonicalContainer abstractDynamicCanonicalContainer = (AbstractDynamicCanonicalContainer)theEObject;
- Object result = caseAbstractDynamicCanonicalContainer(abstractDynamicCanonicalContainer);
- if (result == null) result = caseAttributes(abstractDynamicCanonicalContainer);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case GMFGenExtPackage.DYNAMIC_CANONICAL_COMPARTMENT: {
- DynamicCanonicalCompartment dynamicCanonicalCompartment = (DynamicCanonicalCompartment)theEObject;
- Object result = caseDynamicCanonicalCompartment(dynamicCanonicalCompartment);
- if (result == null) result = caseAbstractDynamicCanonicalContainer(dynamicCanonicalCompartment);
- if (result == null) result = caseAttributes(dynamicCanonicalCompartment);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case GMFGenExtPackage.INTERACTION_DIAGRAM_ATTRIBUTES: {
- InteractionDiagramAttributes interactionDiagramAttributes = (InteractionDiagramAttributes)theEObject;
- Object result = caseInteractionDiagramAttributes(interactionDiagramAttributes);
- if (result == null) result = caseAttributes(interactionDiagramAttributes);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Aux Secondary Diagram Node Attribute</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 interpreting the object as an instance of '<em>Aux Secondary Diagram Node Attribute</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseAuxSecondaryDiagramNodeAttribute(AuxSecondaryDiagramNodeAttribute object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Custom Locator Attributes</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 interpreting the object as an instance of '<em>Custom Locator Attributes</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseCustomLocatorAttributes(CustomLocatorAttributes object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Details Level Attributes</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 interpreting the object as an instance of '<em>Details Level Attributes</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseDetailsLevelAttributes(DetailsLevelAttributes object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Substitutable By Attributes</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 interpreting the object as an instance of '<em>Substitutable By Attributes</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseSubstitutableByAttributes(SubstitutableByAttributes object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Abstract Dynamic Canonical 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 interpreting the object as an instance of '<em>Abstract Dynamic Canonical Container</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseAbstractDynamicCanonicalContainer(AbstractDynamicCanonicalContainer object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Dynamic Canonical Compartment</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Dynamic Canonical Compartment</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseDynamicCanonicalCompartment(DynamicCanonicalCompartment object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Interaction Diagram Attributes</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 interpreting the object as an instance of '<em>Interaction Diagram Attributes</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseInteractionDiagramAttributes(InteractionDiagramAttributes object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Attributes</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 interpreting the object as an instance of '<em>Attributes</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseAttributes(Attributes object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting 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 interpreting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-} //GMFGenExtSwitch
diff --git a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/ui/ExecuteTemplatesActionExt.java b/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/ui/ExecuteTemplatesActionExt.java
deleted file mode 100644
index a77b4bd..0000000
--- a/plugins/org.eclipse.uml2.diagram.codegen/src/org/eclipse/uml2/diagram/codegen/ui/ExecuteTemplatesActionExt.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.uml2.diagram.codegen.ui;
-
-import org.eclipse.gmf.internal.codegen.popup.actions.ExecuteTemplatesAction;
-import org.eclipse.gmf.internal.codegen.popup.actions.ExecuteTemplatesOperation;
-import org.eclipse.uml2.diagram.codegen.ExecuteTemplatesOperationExt;
-
-
-public class ExecuteTemplatesActionExt extends ExecuteTemplatesAction {
- @Override
- protected ExecuteTemplatesOperation createOperation() {
- return new ExecuteTemplatesOperationExt();
- }
-}
diff --git a/plugins/org.eclipse.uml2.diagram.def/behaviors/activityDiagram.gmfgen b/plugins/org.eclipse.uml2.diagram.def/behaviors/activityDiagram.gmfgen
index 5261dab..4b6adfc 100644
--- a/plugins/org.eclipse.uml2.diagram.def/behaviors/activityDiagram.gmfgen
+++ b/plugins/org.eclipse.uml2.diagram.def/behaviors/activityDiagram.gmfgen
@@ -5694,9 +5694,9 @@
</diagram>
<plugin
iD="org.eclipse.uml2.diagram.activity"
- name="Activity Diagram Plugin (Incubation)"
+ name="Activity Diagram Plugin"
provider="Eclipse.org"
- version="0.8.0.qualifier"/>
+ version="0.7.100.qualifier"/>
<editor/>
<navigator>
<childReferences
diff --git a/plugins/org.eclipse.uml2.diagram.def/behaviors/stateMachineDiagram.gmfgen b/plugins/org.eclipse.uml2.diagram.def/behaviors/stateMachineDiagram.gmfgen
index f84f644..ae34177 100644
--- a/plugins/org.eclipse.uml2.diagram.def/behaviors/stateMachineDiagram.gmfgen
+++ b/plugins/org.eclipse.uml2.diagram.def/behaviors/stateMachineDiagram.gmfgen
@@ -25,6 +25,10 @@
<viewmap
xsi:type="gmfgen:FigureViewmap"
figureQualifiedClassName="org.eclipse.draw2d.FreeformLayer"/>
+ <behaviour
+ xsi:type="gmfgen:CustomBehaviour"
+ key=""LayoutEditPolicy""
+ editPolicyQualifiedClassName="org.eclipse.uml2.diagram.common.editpolicies.LaneLayoutEditPolicy"/>
<domainDiagramElement
href="../../../plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml/StateMachine"/>
<childNodes
@@ -1163,10 +1167,6 @@
<attributes
xsi:type="uml2.gmfgenext:AuxSecondaryDiagramNodeAttribute"
substituteWithCanvasElement="true"/>
- <attributes
- xsi:type="gmfgen:DefaultSizeAttributes"
- width="600"
- height="600"/>
<requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs>
<requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs>
</viewmap>
@@ -1485,9 +1485,9 @@
</diagram>
<plugin
iD="org.eclipse.uml2.diagram.statemachine"
- name="State Machine Diagram Plugin (Incubation)"
+ name="State Machine Diagram Plugin"
provider="Eclipse.org"
- version="0.8.0.qualifier"/>
+ version="0.7.100.qualifier"/>
<editor/>
<navigator>
<childReferences
diff --git a/plugins/org.eclipse.uml2.diagram.def/dynamic-templates/codegen/aspects/xpt/diagram/editparts/Common.xpt b/plugins/org.eclipse.uml2.diagram.def/dynamic-templates/codegen/aspects/xpt/diagram/editparts/Common.xpt
new file mode 100644
index 0000000..155cf95
--- /dev/null
+++ b/plugins/org.eclipse.uml2.diagram.def/dynamic-templates/codegen/aspects/xpt/diagram/editparts/Common.xpt
@@ -0,0 +1,21 @@
+/*
+ * 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:
+ * Michael Golubev (Borland) - support for SharedBehaviour's
+ */
+
+«IMPORT "http://www.eclipse.org/gmf/2008/GenModel"»
+«IMPORT "http://www.eclipse.org/emf/2002/Ecore"»
+
+«DEFINE behaviour FOR gmfgen::SharedBehaviour-»
+ «REM»don't alllow delegate to be SharedBehaviour to avoid endless xPand sequence«ENDREM»«-»
+ «IF null != this.delegate && {this.delegate}.typeSelect(gmfgen::SharedBehaviour).isEmpty() -»
+ «EXPAND xpt::diagram::editparts::Common::behaviour FOR this.delegate»
+ «ENDIF-»
+«ENDDEFINE»
diff --git a/plugins/org.eclipse.uml2.diagram.def/structures/profiles.gmfgen b/plugins/org.eclipse.uml2.diagram.def/structures/profiles.gmfgen
index 4f57c80..901e4e8 100644
--- a/plugins/org.eclipse.uml2.diagram.def/structures/profiles.gmfgen
+++ b/plugins/org.eclipse.uml2.diagram.def/structures/profiles.gmfgen
@@ -803,9 +803,8 @@
</diagram>
<plugin
iD="org.eclipse.uml2.diagram.profile"
- name="UML2 Profile Definition Diagram Plug-in (Incubation)"
provider="Eclipse.org"
- version="0.8.0.qualifier"/>
+ version="0.7.1.qualifier"/>
<editor/>
<navigator>
<childReferences
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.diagram.deploy/META-INF/MANIFEST.MF
index fc72c0d..82f8b83 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.uml2.diagram.deploy/META-INF/MANIFEST.MF
@@ -39,4 +39,4 @@
org.eclipse.gef;visibility:=reexport,
org.eclipse.uml2.diagram.common;visibility:=reexport,
org.eclipse.ocl.ecore;visibility:=reexport
-Bundle-ActivationPolicy: lazy
+Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/plugin.properties b/plugins/org.eclipse.uml2.diagram.deploy/plugin.properties
index b975f55..0a626c8 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/plugin.properties
+++ b/plugins/org.eclipse.uml2.diagram.deploy/plugin.properties
@@ -1,4 +1,4 @@
-pluginName=UML2 Deployment Diagram Plugin (Incubation)
+pluginName=Deployment Diagram Plugin (Incubation)
providerName=Eclipse.org
preferences.general=UMLDeployment Diagram
@@ -14,14 +14,14 @@
newWizardName=UMLDeployment Diagram
newWizardDesc=Creates UMLDeployment diagram.
-initDiagramActionLabel=Initialize Deployment Diagram
+initDiagramActionLabel=Initialize umldeployment_diagram diagram file
loadResourceActionLabel=Load Resource...
-navigatorContentName=Deployment Diagram contents
+navigatorContentName=*.umldeployment_diagram diagram contents
domainNavigatorContentName=*.uml model contents
update.diagram.name=Update UMLDeployment diagram
-update.diagram.description=Perform diagram update
+update.diagram.description=Perform UMLDeployment diagram update
# Property Sheet
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/plugin.xml b/plugins/org.eclipse.uml2.diagram.deploy/plugin.xml
index 0a9f67f..a45e401 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/plugin.xml
+++ b/plugins/org.eclipse.uml2.diagram.deploy/plugin.xml
@@ -146,7 +146,39 @@
</GlobalActionHandlerProvider>
</extension>
-
+ <extension point="org.eclipse.gmf.runtime.common.ui.services.action.contributionItemProviders">
+ <?gmfgen generated="true"?>
+ <contributionItemProvider
+ class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContributionItemProvider"
+ checkPluginLoaded="false">
+ <Priority name="Low"/>
+ <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+ <popupStructuredContributionCriteria objectClass="org.eclipse.uml2.diagram.deploy.edit.parts.DeploymentNameEditPart"/>
+ <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
+ <popupPredefinedItem id="deleteFromModelAction" remove="true"/>
+ </popupContribution>
+ <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+ <popupStructuredContributionCriteria objectClass="org.eclipse.uml2.diagram.deploy.edit.parts.ManifestationNameEditPart"/>
+ <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
+ <popupPredefinedItem id="deleteFromModelAction" remove="true"/>
+ </popupContribution>
+ <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+ <popupStructuredContributionCriteria objectClass="org.eclipse.uml2.diagram.deploy.edit.parts.DeploymentConfigurationEditPart"/>
+ <popupAction path="/editGroup" id="deleteFromModelAction"/>
+ <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
+ </popupContribution>
+ <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+ <popupStructuredContributionCriteria objectClass="org.eclipse.uml2.diagram.deploy.edit.parts.CommunicationPathNameEditPart"/>
+ <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
+ <popupPredefinedItem id="deleteFromModelAction" remove="true"/>
+ </popupContribution>
+ <popupContribution class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
+ <popupStructuredContributionCriteria objectClass="org.eclipse.uml2.diagram.deploy.edit.parts.DependencyNameEditPart"/>
+ <popupPredefinedItem id="deleteFromDiagramAction" remove="true"/>
+ <popupPredefinedItem id="deleteFromModelAction" remove="true"/>
+ </popupContribution>
+ </contributionItemProvider>
+ </extension>
<extension point="org.eclipse.core.runtime.preferences">
<?gmfgen generated="true"?>
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeploymentSpecificationPropertiesCanonicalEditPolicy.java b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeploymentSpecificationPropertiesCanonicalEditPolicy.java
index e0031d8..cbf74ac 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeploymentSpecificationPropertiesCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeploymentSpecificationPropertiesCanonicalEditPolicy.java
@@ -44,9 +44,7 @@
int visualID = UMLVisualIDRegistry.getVisualID(view);
switch (visualID) {
case PropertyEditPart.VISUAL_ID:
- if (!semanticChildren.contains(view.getElement())) {
- return true;
- }
+ return !semanticChildren.contains(view.getElement()) || visualID != UMLVisualIDRegistry.getNodeVisualID((View) getHost().getModel(), view.getElement());
}
return false;
}
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeviceDevicecontents2CanonicalEditPolicy.java b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeviceDevicecontents2CanonicalEditPolicy.java
index 2436fe3..8366d25 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeviceDevicecontents2CanonicalEditPolicy.java
+++ b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeviceDevicecontents2CanonicalEditPolicy.java
@@ -50,9 +50,7 @@
case ArtifactEditPart.VISUAL_ID:
case ExecutionEnvironment2EditPart.VISUAL_ID:
case Node2EditPart.VISUAL_ID:
- if (!semanticChildren.contains(view.getElement())) {
- return true;
- }
+ return !semanticChildren.contains(view.getElement()) || visualID != UMLVisualIDRegistry.getNodeVisualID((View) getHost().getModel(), view.getElement());
}
return false;
}
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeviceDevicecontentsCanonicalEditPolicy.java b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeviceDevicecontentsCanonicalEditPolicy.java
index 4bd4ae4..1a45cc3 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeviceDevicecontentsCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/DeviceDevicecontentsCanonicalEditPolicy.java
@@ -50,9 +50,7 @@
case ArtifactEditPart.VISUAL_ID:
case ExecutionEnvironment2EditPart.VISUAL_ID:
case Node2EditPart.VISUAL_ID:
- if (!semanticChildren.contains(view.getElement())) {
- return true;
- }
+ return !semanticChildren.contains(view.getElement()) || visualID != UMLVisualIDRegistry.getNodeVisualID((View) getHost().getModel(), view.getElement());
}
return false;
}
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/ExecutionEnvironmentArtifacts2CanonicalEditPolicy.java b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/ExecutionEnvironmentArtifacts2CanonicalEditPolicy.java
index d456078..700c808 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/ExecutionEnvironmentArtifacts2CanonicalEditPolicy.java
+++ b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/ExecutionEnvironmentArtifacts2CanonicalEditPolicy.java
@@ -44,9 +44,7 @@
int visualID = UMLVisualIDRegistry.getVisualID(view);
switch (visualID) {
case Artifact3EditPart.VISUAL_ID:
- if (!semanticChildren.contains(view.getElement())) {
- return true;
- }
+ return !semanticChildren.contains(view.getElement()) || visualID != UMLVisualIDRegistry.getNodeVisualID((View) getHost().getModel(), view.getElement());
}
return false;
}
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/ExecutionEnvironmentArtifactsCanonicalEditPolicy.java b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/ExecutionEnvironmentArtifactsCanonicalEditPolicy.java
index 3d0d13a..f75e8e5 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/ExecutionEnvironmentArtifactsCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/ExecutionEnvironmentArtifactsCanonicalEditPolicy.java
@@ -45,9 +45,7 @@
int visualID = UMLVisualIDRegistry.getVisualID(view);
switch (visualID) {
case Artifact3EditPart.VISUAL_ID:
- if (!semanticChildren.contains(view.getElement())) {
- return true;
- }
+ return !semanticChildren.contains(view.getElement()) || visualID != UMLVisualIDRegistry.getNodeVisualID((View) getHost().getModel(), view.getElement());
}
return false;
}
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/PackageCanonicalEditPolicy.java b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/PackageCanonicalEditPolicy.java
index 75d544f..f56c4a0 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/PackageCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/PackageCanonicalEditPolicy.java
@@ -89,9 +89,7 @@
case ExecutionEnvironmentEditPart.VISUAL_ID:
case Artifact2EditPart.VISUAL_ID:
case DeploymentSpecificationEditPart.VISUAL_ID:
- if (!semanticChildren.contains(view.getElement())) {
- return true;
- }
+ return !semanticChildren.contains(view.getElement()) || visualID != UMLVisualIDRegistry.getNodeVisualID((View) getHost().getModel(), view.getElement());
}
return false;
}
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/PackageImportsCanonicalEditPolicy.java b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/PackageImportsCanonicalEditPolicy.java
index 350ef8b..d2a7ebe 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/PackageImportsCanonicalEditPolicy.java
+++ b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/edit/policies/PackageImportsCanonicalEditPolicy.java
@@ -44,9 +44,7 @@
int visualID = UMLVisualIDRegistry.getVisualID(view);
switch (visualID) {
case ElementImportEditPart.VISUAL_ID:
- if (!semanticChildren.contains(view.getElement())) {
- return true;
- }
+ return !semanticChildren.contains(view.getElement()) || visualID != UMLVisualIDRegistry.getNodeVisualID((View) getHost().getModel(), view.getElement());
}
return false;
}
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLDiagramEditor.java b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLDiagramEditor.java
index ae0da44..e850cf5 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLDiagramEditor.java
+++ b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLDiagramEditor.java
@@ -18,7 +18,6 @@
import org.eclipse.gef.palette.PaletteRoot;
import org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService;
import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds;
import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider;
@@ -261,16 +260,6 @@
/**
* @generated
*/
- protected void configureGraphicalViewer() {
- super.configureGraphicalViewer();
- DiagramEditorContextMenuProvider provider = new DiagramEditorContextMenuProvider(this, getDiagramGraphicalViewer());
- getDiagramGraphicalViewer().setContextMenu(provider);
- getSite().registerContextMenu(ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer());
- }
-
- /**
- * @generated
- */
public void refresh() {
refreshPalette();
refreshDiagram();
diff --git a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLVisualIDRegistry.java b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLVisualIDRegistry.java
index 63f7570..d0570b9 100644
--- a/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLVisualIDRegistry.java
+++ b/plugins/org.eclipse.uml2.diagram.deploy/src/org/eclipse/uml2/diagram/deploy/part/UMLVisualIDRegistry.java
@@ -537,117 +537,4 @@
return false;
}
- /**
- * @generated
- */
- public static int getChildDescriptorVisualID(UMLNodeDescriptor container, EObject domainElement) {
- if (domainElement == null) {
- return -1;
- }
- switch (container.getVisualID()) {
- case Package2EditPart.VISUAL_ID:
- if (UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) {
- return ElementImportEditPart.VISUAL_ID;
- }
- break;
- case DeviceEditPart.VISUAL_ID:
- if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
- return Device2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_3002((Artifact) domainElement)) {
- return ArtifactEditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
- return ExecutionEnvironment2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass()) && isNode_3007((Node) domainElement)) {
- return Node2EditPart.VISUAL_ID;
- }
- break;
- case ExecutionEnvironmentEditPart.VISUAL_ID:
- if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
- return Artifact3EditPart.VISUAL_ID;
- }
- break;
- case DeploymentSpecificationEditPart.VISUAL_ID:
- if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {
- return PropertyEditPart.VISUAL_ID;
- }
- break;
- case Device2EditPart.VISUAL_ID:
- if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
- return Device2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_3002((Artifact) domainElement)) {
- return ArtifactEditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
- return ExecutionEnvironment2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass()) && isNode_3007((Node) domainElement)) {
- return Node2EditPart.VISUAL_ID;
- }
- break;
- case ExecutionEnvironment2EditPart.VISUAL_ID:
- if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
- return Artifact3EditPart.VISUAL_ID;
- }
- break;
- case PackageEditPart.VISUAL_ID:
- if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
- return DeviceEditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass()) && isNode_2004((Node) domainElement)) {
- return NodeEditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
- return ExecutionEnvironmentEditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_2006((Artifact) domainElement)) {
- return Artifact2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getDeploymentSpecification().isSuperTypeOf(domainElement.eClass())) {
- return DeploymentSpecificationEditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getElementImport().isSuperTypeOf(domainElement.eClass())) {
- return ElementImportEditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
- return Device2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_3002((Artifact) domainElement)) {
- return ArtifactEditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
- return ExecutionEnvironment2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass()) && isNode_3007((Node) domainElement)) {
- return Node2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getDevice().isSuperTypeOf(domainElement.eClass())) {
- return Device2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass()) && isArtifact_3002((Artifact) domainElement)) {
- return ArtifactEditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getExecutionEnvironment().isSuperTypeOf(domainElement.eClass())) {
- return ExecutionEnvironment2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getNode().isSuperTypeOf(domainElement.eClass()) && isNode_3007((Node) domainElement)) {
- return Node2EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
- return Artifact3EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getArtifact().isSuperTypeOf(domainElement.eClass())) {
- return Artifact3EditPart.VISUAL_ID;
- }
- if (UMLPackage.eINSTANCE.getProperty().isSuperTypeOf(domainElement.eClass())) {
- return PropertyEditPart.VISUAL_ID;
- }
- break;
- }
- return -1;
- }
-
}
diff --git a/plugins/org.eclipse.uml2.diagram.usecase/plugin.properties b/plugins/org.eclipse.uml2.diagram.usecase/plugin.properties
index e90ddd0..f6a4c32 100644
--- a/plugins/org.eclipse.uml2.diagram.usecase/plugin.properties
+++ b/plugins/org.eclipse.uml2.diagram.usecase/plugin.properties
@@ -1,4 +1,4 @@
-pluginName=UML2 Use Case Diagram Plugin (Incubation)
+pluginName=Use Case Diagram Plugin (Incubation)
providerName=Eclipse.org
preferences.general=UMLUseCase Diagram
@@ -14,14 +14,14 @@
newWizardName=UMLUseCase Diagram
newWizardDesc=Creates UMLUseCase diagram.
-initDiagramActionLabel=Initialize Use Case Diagram
+initDiagramActionLabel=Initialize umlusecase_diagram diagram file
loadResourceActionLabel=Load Resource...
-navigatorContentName=Use Case Diagram contents
+navigatorContentName=*.umlusecase_diagram diagram contents
domainNavigatorContentName=*.uml model contents
update.diagram.name=Update UMLUseCase diagram
-update.diagram.description=Perform diagram update
+update.diagram.description=Perform UMLUseCase diagram update
# Property Sheet
@@ -62,5 +62,5 @@
preference.page.title.org.eclipse.uml2.uml.diagram.usecase.pathmaps=Pathmaps
metatype.name.Dependency_4006=Dependency
-
+
preferences.icons=Icon Style
diff --git a/plugins/org.eclipse.uml2.diagram/.classpath b/plugins/org.eclipse.uml2.diagram/.classpath
deleted file mode 100644
index acad1c2..0000000
--- a/plugins/org.eclipse.uml2.diagram/.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/plugins/org.eclipse.uml2.diagram/.project b/plugins/org.eclipse.uml2.diagram/.project
deleted file mode 100644
index f386f55..0000000
--- a/plugins/org.eclipse.uml2.diagram/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram</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/plugins/org.eclipse.uml2.diagram/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2.diagram/META-INF/MANIFEST.MF
deleted file mode 100644
index d636a1d..0000000
--- a/plugins/org.eclipse.uml2.diagram/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2.diagram/about.html b/plugins/org.eclipse.uml2.diagram/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/plugins/org.eclipse.uml2.diagram/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/plugins/org.eclipse.uml2.diagram/about.ini b/plugins/org.eclipse.uml2.diagram/about.ini
deleted file mode 100644
index 945d061..0000000
--- a/plugins/org.eclipse.uml2.diagram/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/plugins/org.eclipse.uml2.diagram/about.mappings b/plugins/org.eclipse.uml2.diagram/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/plugins/org.eclipse.uml2.diagram/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=@build@
diff --git a/plugins/org.eclipse.uml2.diagram/about.properties b/plugins/org.eclipse.uml2.diagram/about.properties
deleted file mode 100644
index 5785761..0000000
--- a/plugins/org.eclipse.uml2.diagram/about.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-# /**
-# * <copyright>
-# *
-# * Copyright (c) 2006 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=UML2 Diagramming
-
-featureText=UML2 Diagramming \n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Borland Software Corporation and others. 2006. All rights reserved.\n\
-\n\
-UML2 Diagramming based on Eclipse UML2 and GMF projects.\n\
-Visit http://www.eclipse.org/modeling/mdt/
-
diff --git a/plugins/org.eclipse.uml2.diagram/build.properties b/plugins/org.eclipse.uml2.diagram/build.properties
deleted file mode 100644
index 7262784..0000000
--- a/plugins/org.eclipse.uml2.diagram/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- plugin.xml,\
- plugin.properties,\
- modeling32.png,\
- META-INF/,\
- license.html
-src.includes = about.html
-
diff --git a/plugins/org.eclipse.uml2.diagram/license.html b/plugins/org.eclipse.uml2.diagram/license.html
deleted file mode 100644
index d7b88e9..0000000
--- a/plugins/org.eclipse.uml2.diagram/license.html
+++ /dev/null
@@ -1,319 +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="http://www.eclipse.org/org/documents/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 style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " 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: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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: 10pt;">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: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED 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. 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: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">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: 10pt;">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: 10pt;">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: 10pt;">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]--> <!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2.diagram/modeling32.png b/plugins/org.eclipse.uml2.diagram/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/plugins/org.eclipse.uml2.diagram/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2.diagram/plugin.properties b/plugins/org.eclipse.uml2.diagram/plugin.properties
deleted file mode 100644
index 1bd3691..0000000
--- a/plugins/org.eclipse.uml2.diagram/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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=UML2 Diagramming Plug-in (Incubation)
-providerName=Eclipse.org
diff --git a/plugins/org.eclipse.uml2.diagram/plugin.xml b/plugins/org.eclipse.uml2.diagram/plugin.xml
deleted file mode 100644
index 347e730..0000000
--- a/plugins/org.eclipse.uml2.diagram/plugin.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin />
diff --git a/plugins/org.eclipse.uml2tools-feature/org.eclipse.uml2tools.sdk/feature.xml b/plugins/org.eclipse.uml2tools-feature/org.eclipse.uml2tools.sdk/feature.xml
index 0b2ab21..16b4506 100644
--- a/plugins/org.eclipse.uml2tools-feature/org.eclipse.uml2tools.sdk/feature.xml
+++ b/plugins/org.eclipse.uml2tools-feature/org.eclipse.uml2tools.sdk/feature.xml
@@ -42,4 +42,9 @@
<includes
id="org.eclipse.uml2.diagram.source"
version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.uml2tools.examples"
+ version="0.0.0"/>
+
</feature>
diff --git a/plugins/org.eclipse.uml2tools/.project b/plugins/org.eclipse.uml2tools/.project
deleted file mode 100755
index ac032bd..0000000
--- a/plugins/org.eclipse.uml2tools/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2tools</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/plugins/org.eclipse.uml2tools/META-INF/MANIFEST.MF b/plugins/org.eclipse.uml2tools/META-INF/MANIFEST.MF
deleted file mode 100755
index 67a21b8..0000000
--- a/plugins/org.eclipse.uml2tools/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2tools;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.uml2tools/about.html b/plugins/org.eclipse.uml2tools/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/plugins/org.eclipse.uml2tools/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/plugins/org.eclipse.uml2tools/about.ini b/plugins/org.eclipse.uml2tools/about.ini
deleted file mode 100755
index 945d061..0000000
--- a/plugins/org.eclipse.uml2tools/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/plugins/org.eclipse.uml2tools/about.mappings b/plugins/org.eclipse.uml2tools/about.mappings
deleted file mode 100755
index a28390a..0000000
--- a/plugins/org.eclipse.uml2tools/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=@build@
diff --git a/plugins/org.eclipse.uml2tools/about.properties b/plugins/org.eclipse.uml2tools/about.properties
deleted file mode 100644
index c079035..0000000
--- a/plugins/org.eclipse.uml2tools/about.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-# /**
-# * <copyright>
-# *
-# * Copyright (c) 2006 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=UML2 Tools
-
-featureText=UML2 Tools \n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Borland Software Corporation and others. 2006. All rights reserved.\n\
-\n\
-UML2 Tools based on Eclipse UML2 and GMF projects.\n\
-Visit http://www.eclipse.org/modeling/mdt/
-
diff --git a/plugins/org.eclipse.uml2tools/build.properties b/plugins/org.eclipse.uml2tools/build.properties
deleted file mode 100755
index 6dccca6..0000000
--- a/plugins/org.eclipse.uml2tools/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = about.html,\
- about.ini,\
- about.mappings,\
- about.properties,\
- plugin.xml,\
- plugin.properties,\
- modeling32.png,\
- META-INF/,\
- license.html
-src.includes = about.html
-
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2tools/license.html b/plugins/org.eclipse.uml2tools/license.html
deleted file mode 100755
index d7b88e9..0000000
--- a/plugins/org.eclipse.uml2tools/license.html
+++ /dev/null
@@ -1,319 +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="http://www.eclipse.org/org/documents/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 style="" lang="EN-US">
-
-<div class="Section1">
-
-<p style="text-align: center;" align="center"><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style="font-size: 10pt;">THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style="font-size: 10pt;">1. DEFINITIONS</span></b> </p>
-
-<p><span style="font-size: 10pt;">"Contribution" means:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">i)
-changes to the Program, and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">ii)
-additions to the Program;</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style="font-size: 10pt;">"Licensed Patents " 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: 10pt;">"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style="font-size: 10pt;">"Recipient" means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style="font-size: 10pt;">2. GRANT OF RIGHTS</span></b> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">3. REQUIREMENTS</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b)
-its license agreement:</span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 0.5in;"><span style="font-size: 10pt;">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: 10pt;">When the Program is made available in source
-code form:</span> </p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">a)
-it must be made available under this Agreement; and </span></p>
-
-<p class="MsoNormal" style="margin-left: 0.5in;"><span style="font-size: 10pt;">b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style="font-size: 10pt;">Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style="font-size: 10pt;">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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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: 10pt;">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: 10pt;">5. NO WARRANTY</span></b> </p>
-
-<p><span style="font-size: 10pt;">EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED 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. 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: 10pt;">6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">7. GENERAL</span></b> </p>
-
-<p><span style="font-size: 10pt;">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: 10pt;">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: 10pt;">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: 10pt;">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: 10pt;">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]--> <!--[endif]--><o:p></o:p></p>
-
-</div>
-
-</body></html>
\ No newline at end of file
diff --git a/plugins/org.eclipse.uml2tools/modeling32.png b/plugins/org.eclipse.uml2tools/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/plugins/org.eclipse.uml2tools/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.uml2tools/plugin.properties b/plugins/org.eclipse.uml2tools/plugin.properties
deleted file mode 100644
index 698bd1c..0000000
--- a/plugins/org.eclipse.uml2tools/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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=UML2 Tools Plug-in (Incubation)
-providerName=Eclipse.org
diff --git a/plugins/org.eclipse.uml2tools/plugin.xml b/plugins/org.eclipse.uml2tools/plugin.xml
deleted file mode 100755
index 347e730..0000000
--- a/plugins/org.eclipse.uml2tools/plugin.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin />
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/.classpath b/tests/org.eclipse.uml2.diagram.activity.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/.project b/tests/org.eclipse.uml2.diagram.activity.tests/.project
deleted file mode 100644
index d4a7351..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.activity.tests</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/tests/org.eclipse.uml2.diagram.activity.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.diagram.activity.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index dce2582..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.activity.tests;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.emf.ecore,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.notation,
- org.eclipse.gmf.runtime.common.ui,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.uml2.diagram.common.tests,
- org.junit,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.uml2.diagram.activity
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/about.html b/tests/org.eclipse.uml2.diagram.activity.tests/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/tests/org.eclipse.uml2.diagram.activity.tests/build.properties b/tests/org.eclipse.uml2.diagram.activity.tests/build.properties
deleted file mode 100644
index 48a4888..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-jars.compile.order = .
-output.. = bin/
-source.. = src/
-
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- plugin.xml,\
- .,\
- test.xml,\
- testDiagrams/,\
- examples/
-
-src.includes = about.html,\
- test.xml
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.115.Object node notations.uml b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.115.Object node notations.uml
deleted file mode 100644
index d6d8b07..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.115.Object node notations.uml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_KQw94KJKEdy6lo8fyt_TJQ">
- <elementImport xmi:id="_KT5KYKJKEdy6lo8fyt_TJQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_KUMFUKJKEdy6lo8fyt_TJQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_KUMFUaJKEdy6lo8fyt_TJQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_KUMFUqJKEdy6lo8fyt_TJQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Activity" xmi:id="_NlQNcKJKEdy6lo8fyt_TJQ" name="Object node notations">
- <node xmi:type="uml:CentralBufferNode" xmi:id="_TTIrYKJMEdy6lo8fyt_TJQ" name="name" inState="_CyWZoKJMEdy6lo8fyt_TJQ _GMWbUKJMEdy6lo8fyt_TJQ _EgxDQKJMEdy6lo8fyt_TJQ"/>
- <node xmi:type="uml:DataStoreNode" xmi:id="_UXYWoKJMEdy6lo8fyt_TJQ" name="name">
- <upperBound xmi:type="uml:LiteralInteger" xmi:id="_hPRPEKJMEdy6lo8fyt_TJQ" value="2"/>
- </node>
- <node xmi:type="uml:Pin" xmi:id="_VZ15MKJMEdy6lo8fyt_TJQ" name="name" ordering="LIFO"/>
- </packagedElement>
- <packagedElement xmi:type="uml:StateMachine" xmi:id="_9E0PEKJLEdy6lo8fyt_TJQ" name="StateMachine">
- <region xmi:id="_AZdPoKJMEdy6lo8fyt_TJQ">
- <subvertex xmi:type="uml:State" xmi:id="_CyWZoKJMEdy6lo8fyt_TJQ" name="state"/>
- <subvertex xmi:type="uml:FinalState" xmi:id="_EgxDQKJMEdy6lo8fyt_TJQ" name="final state"/>
- <subvertex xmi:type="uml:State" xmi:id="_GMWbUKJMEdy6lo8fyt_TJQ" name="composite state">
- <region xmi:id="_H3V9gKJMEdy6lo8fyt_TJQ"/>
- </subvertex>
- </region>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.115.Object node notations.umlactivity_diagram b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.115.Object node notations.umlactivity_diagram
deleted file mode 100644
index 04a0d3c..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.115.Object node notations.umlactivity_diagram
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_KYXasKJKEdy6lo8fyt_TJQ" type="UMLActivity" name="12.115.Object node notations.umlactivity_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_No1F4KJKEdy6lo8fyt_TJQ" type="2026">
- <children xmi:type="notation:Node" xmi:id="_No1F46JKEdy6lo8fyt_TJQ" type="5030"/>
- <children xmi:type="notation:Node" xmi:id="_TTbmUKJMEdy6lo8fyt_TJQ" type="3037">
- <children xmi:type="notation:Node" xmi:id="_TW3U0KJMEdy6lo8fyt_TJQ" type="5032"/>
- <children xmi:type="notation:Node" xmi:id="_TXAewKJMEdy6lo8fyt_TJQ" type="5038"/>
- <children xmi:type="notation:Node" xmi:id="_TXUAwKJMEdy6lo8fyt_TJQ" type="5049">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_TXUAwaJMEdy6lo8fyt_TJQ" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_TTbmUaJMEdy6lo8fyt_TJQ"/>
- <element xmi:type="uml:CentralBufferNode" href="12.115.Object node notations.uml#_TTIrYKJMEdy6lo8fyt_TJQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TTbmUqJMEdy6lo8fyt_TJQ" x="60" y="28"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_UXr4oKJMEdy6lo8fyt_TJQ" type="3036">
- <children xmi:type="notation:Node" xmi:id="_UXr4o6JMEdy6lo8fyt_TJQ" type="5034"/>
- <children xmi:type="notation:Node" xmi:id="_UXr4pKJMEdy6lo8fyt_TJQ" type="5036"/>
- <children xmi:type="notation:Node" xmi:id="_UXr4paJMEdy6lo8fyt_TJQ" type="5051">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_UXr4pqJMEdy6lo8fyt_TJQ" x="1" y="72"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_UXr4oaJMEdy6lo8fyt_TJQ"/>
- <element xmi:type="uml:DataStoreNode" href="12.115.Object node notations.uml#_UXYWoKJMEdy6lo8fyt_TJQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UXr4oqJMEdy6lo8fyt_TJQ" x="312" y="28"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_VaI0IKJMEdy6lo8fyt_TJQ" type="3041">
- <children xmi:type="notation:Node" xmi:id="_VaI0I6JMEdy6lo8fyt_TJQ" type="5024"/>
- <children xmi:type="notation:Node" xmi:id="_VaI0JKJMEdy6lo8fyt_TJQ" type="5052">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_VaI0JaJMEdy6lo8fyt_TJQ" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_VaI0IaJMEdy6lo8fyt_TJQ"/>
- <element xmi:type="uml:Pin" href="12.115.Object node notations.uml#_VZ15MKJMEdy6lo8fyt_TJQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VaI0IqJMEdy6lo8fyt_TJQ" x="468" y="34"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_No1F4aJKEdy6lo8fyt_TJQ"/>
- <element xmi:type="uml:Activity" href="12.115.Object node notations.uml#_NlQNcKJKEdy6lo8fyt_TJQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_No1F4qJKEdy6lo8fyt_TJQ" x="48" y="36" width="589" height="169"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_KYXasaJKEdy6lo8fyt_TJQ"/>
- <element xmi:type="uml:Package" href="12.115.Object node notations.uml#_KQw94KJKEdy6lo8fyt_TJQ"/>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.126.Pin examples.uml b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.126.Pin examples.uml
deleted file mode 100644
index f1791ca..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.126.Pin examples.uml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_W4YRgAkyEdyF_oRbgI8ypA">
- <packagedElement xmi:type="uml:Activity" xmi:id="_l-AM0AkyEdyF_oRbgI8ypA" name="Pin examples">
- <node xmi:type="uml:OpaqueAction" xmi:id="_wumooAkyEdyF_oRbgI8ypA" name="Accept Order">
- <outputValue xmi:id="_4jAZEAkyEdyF_oRbgI8ypA" name="Order" outgoing="_ZTzVoAkzEdyF_oRbgI8ypA"/>
- </node>
- <node xmi:type="uml:OpaqueAction" xmi:id="_xuYqoAkyEdyF_oRbgI8ypA" name="Pick Materials for Order">
- <outputValue xmi:id="_6e1zoAkyEdyF_oRbgI8ypA" name="Materials" outgoing="_Z8yBMAkzEdyF_oRbgI8ypA" inState="_qHrC4KI7EdyGqNfYOUez1Q"/>
- </node>
- <node xmi:type="uml:OpaqueAction" xmi:id="_zBPZoAkyEdyF_oRbgI8ypA" name="Produce Designs">
- <outputValue xmi:id="_UdjYYAkzEdyF_oRbgI8ypA" name="PC designs" outgoing="_akao8AkzEdyF_oRbgI8ypA"/>
- </node>
- <node xmi:type="uml:CallOperationAction" xmi:id="_Ng5IQAkzEdyF_oRbgI8ypA" name="Assemble Order">
- <argument xmi:id="_PsYIYAkzEdyF_oRbgI8ypA" name="Order" incoming="_ZTzVoAkzEdyF_oRbgI8ypA" inState="_vrqP4KI7EdyGqNfYOUez1Q"/>
- <argument xmi:id="_QzTUMAkzEdyF_oRbgI8ypA" name="Materials" incoming="_Z8yBMAkzEdyF_oRbgI8ypA" inState="_qHrC4KI7EdyGqNfYOUez1Q"/>
- <argument xmi:id="_VLv7IAkzEdyF_oRbgI8ypA" name="PC designs" incoming="_akao8AkzEdyF_oRbgI8ypA"/>
- <result xmi:id="_do01IAkzEdyF_oRbgI8ypA" name="Order" inState="_tZVA4KI7EdyGqNfYOUez1Q"/>
- </node>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_ZTzVoAkzEdyF_oRbgI8ypA" source="_4jAZEAkyEdyF_oRbgI8ypA" target="_PsYIYAkzEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_Z8yBMAkzEdyF_oRbgI8ypA" source="_6e1zoAkyEdyF_oRbgI8ypA" target="_QzTUMAkzEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_akao8AkzEdyF_oRbgI8ypA" source="_UdjYYAkzEdyF_oRbgI8ypA" target="_VLv7IAkzEdyF_oRbgI8ypA"/>
- </packagedElement>
- <packagedElement xmi:type="uml:StateMachine" xmi:id="_kMuucKI7EdyGqNfYOUez1Q" name="StateMachine">
- <region xmi:id="_pCYOwKI7EdyGqNfYOUez1Q">
- <subvertex xmi:type="uml:State" xmi:id="_qHrC4KI7EdyGqNfYOUez1Q" name="picked"/>
- <subvertex xmi:type="uml:State" xmi:id="_tZVA4KI7EdyGqNfYOUez1Q" name="assembled"/>
- <subvertex xmi:type="uml:State" xmi:id="_vrqP4KI7EdyGqNfYOUez1Q" name="accepted"/>
- </region>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.126.Pin examples.umlactivity_diagram b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.126.Pin examples.umlactivity_diagram
deleted file mode 100644
index b519367..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.126.Pin examples.umlactivity_diagram
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_W4YRgQkyEdyF_oRbgI8ypA" type="UMLActivity" name="12.126.Pin examples.umlactivity_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_l-THwAkyEdyF_oRbgI8ypA" type="2026">
- <children xmi:type="notation:Node" xmi:id="_l-THwwkyEdyF_oRbgI8ypA" type="5030"/>
- <children xmi:type="notation:Node" xmi:id="__zn5UKI4EdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="__zn5U6I4EdyGqNfYOUez1Q" type="5023"/>
- <children xmi:type="notation:Node" xmi:id="_a6qQsKI8EdyGqNfYOUez1Q" type="3001">
- <children xmi:type="notation:Node" xmi:id="_a6qQs6I8EdyGqNfYOUez1Q" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a6qQtKI8EdyGqNfYOUez1Q" y="5"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_a6qQtaI8EdyGqNfYOUez1Q" type="5055">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a6qQtqI8EdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_a6qQsaI8EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OutputPin" href="12.126.Pin examples.uml#_4jAZEAkyEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6qQsqI8EdyGqNfYOUez1Q"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__zn5UaI4EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.126.Pin examples.uml#_wumooAkyEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__zn5UqI4EdyGqNfYOUez1Q" x="60" y="58"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__zn5VKI4EdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="__zn5V6I4EdyGqNfYOUez1Q" type="5023"/>
- <children xmi:type="notation:Node" xmi:id="_a6zaoKI8EdyGqNfYOUez1Q" type="3001">
- <children xmi:type="notation:Node" xmi:id="_a6zao6I8EdyGqNfYOUez1Q" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a6zapKI8EdyGqNfYOUez1Q" y="5"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_a6zapaI8EdyGqNfYOUez1Q" type="5055">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a6zapqI8EdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_a6zaoaI8EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OutputPin" href="12.126.Pin examples.uml#_6e1zoAkyEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a6zaoqI8EdyGqNfYOUez1Q" x="134" y="24"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__zn5VaI4EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.126.Pin examples.uml#_xuYqoAkyEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__zn5VqI4EdyGqNfYOUez1Q" x="36" y="202"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__zn5WKI4EdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="__zxDQKI4EdyGqNfYOUez1Q" type="5023"/>
- <children xmi:type="notation:Node" xmi:id="__1aCB6I4EdyGqNfYOUez1Q" type="3001">
- <children xmi:type="notation:Node" xmi:id="__1aCCqI4EdyGqNfYOUez1Q" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__1aCC6I4EdyGqNfYOUez1Q" y="5"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__1aCDKI4EdyGqNfYOUez1Q" type="5055">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__1aCDaI4EdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__1aCCKI4EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OutputPin" href="12.126.Pin examples.uml#_UdjYYAkzEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__1aCCaI4EdyGqNfYOUez1Q"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__zn5WaI4EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.126.Pin examples.uml#_zBPZoAkyEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__zn5WqI4EdyGqNfYOUez1Q" x="240" y="58"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__zxDQaI4EdyGqNfYOUez1Q" type="3045">
- <children xmi:type="notation:Node" xmi:id="__zxDRKI4EdyGqNfYOUez1Q" type="5028"/>
- <children xmi:type="notation:Node" xmi:id="__2Ae8KI4EdyGqNfYOUez1Q" type="3006">
- <children xmi:type="notation:Node" xmi:id="__2Jo4KI4EdyGqNfYOUez1Q" type="5010">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__2Jo4aI4EdyGqNfYOUez1Q" x="35" y="21"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__2TZ4KI4EdyGqNfYOUez1Q" type="5060">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__2TZ4aI4EdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__2Ae8aI4EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OutputPin" href="12.126.Pin examples.uml#_do01IAkzEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__2Ae8qI4EdyGqNfYOUez1Q"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__2TZ4qI4EdyGqNfYOUez1Q" type="3007">
- <children xmi:type="notation:Node" xmi:id="__2wF0KI4EdyGqNfYOUez1Q" type="5011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__2wF0aI4EdyGqNfYOUez1Q" x="-51" y="-20"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__25PwKI4EdyGqNfYOUez1Q" type="5061">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__25PwaI4EdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__2TZ46I4EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:InputPin" href="12.126.Pin examples.uml#_PsYIYAkzEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__2TZ5KI4EdyGqNfYOUez1Q" x="-14" y="24"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__25PwqI4EdyGqNfYOUez1Q" type="3007">
- <children xmi:type="notation:Node" xmi:id="__25PxaI4EdyGqNfYOUez1Q" type="5011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__25PxqI4EdyGqNfYOUez1Q" x="-66" y="21"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__25Px6I4EdyGqNfYOUez1Q" type="5061">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__25PyKI4EdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__25Pw6I4EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:InputPin" href="12.126.Pin examples.uml#_QzTUMAkzEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__25PxKI4EdyGqNfYOUez1Q" x="36" y="49"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__25PyaI4EdyGqNfYOUez1Q" type="3007">
- <children xmi:type="notation:Node" xmi:id="__25PzKI4EdyGqNfYOUez1Q" type="5011">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__25PzaI4EdyGqNfYOUez1Q" x="35" y="-20"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__25PzqI4EdyGqNfYOUez1Q" type="5061">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__25Pz6I4EdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__25PyqI4EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:InputPin" href="12.126.Pin examples.uml#_VLv7IAkzEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__25Py6I4EdyGqNfYOUez1Q" x="36" y="-14"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__zxDQqI4EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.126.Pin examples.uml#_Ng5IQAkzEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__zxDQ6I4EdyGqNfYOUez1Q" x="348" y="178"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_l-THwQkyEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Activity" href="12.126.Pin examples.uml#_l-AM0AkyEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_l-THwgkyEdyF_oRbgI8ypA" x="48" y="36" width="589" height="313"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_W4YRggkyEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Package" href="12.126.Pin examples.uml#_W4YRgAkyEdyF_oRbgI8ypA"/>
- <edges xmi:type="notation:Edge" xmi:id="_a69LoKI8EdyGqNfYOUez1Q" type="4002" source="_a6qQsKI8EdyGqNfYOUez1Q" target="__2TZ4qI4EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_a69LpKI8EdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a69LpaI8EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_a69LpqI8EdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a69Lp6I8EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_a69LoaI8EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_a69LoqI8EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.126.Pin examples.uml#_ZTzVoAkzEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a69Lo6I8EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_a69LqKI8EdyGqNfYOUez1Q" type="4002" source="_a6zaoKI8EdyGqNfYOUez1Q" target="__25PwqI4EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_a69LrKI8EdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a69LraI8EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_a69LrqI8EdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a69Lr6I8EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_a69LqaI8EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_a69LqqI8EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.126.Pin examples.uml#_Z8yBMAkzEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a69Lq6I8EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_a69LsKI8EdyGqNfYOUez1Q" type="4002" source="__1aCB6I4EdyGqNfYOUez1Q" target="__25PyaI4EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_a69LtKI8EdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a69LtaI8EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_a69LtqI8EdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_a69Lt6I8EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_a69LsaI8EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_a69LsqI8EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.126.Pin examples.uml#_akao8AkzEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_a69Ls6I8EdyGqNfYOUez1Q" points="[8, 0, -37, -81]$[45, 0, 0, -81]$[45, 74, 0, -7]"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.35.Example of an activity with input parameter.uml b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.35.Example of an activity with input parameter.uml
deleted file mode 100644
index 73f6687..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.35.Example of an activity with input parameter.uml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_ydKOcAktEdyF_oRbgI8ypA">
- <packagedElement xmi:type="uml:Activity" xmi:id="_zkjUUAktEdyF_oRbgI8ypA" name="Process Order">
- <node xmi:type="uml:ActivityParameterNode" xmi:id="_5-t7YAktEdyF_oRbgI8ypA" name="Requested Order" outgoing="_M5RrcAkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_rAsAYAkuEdyF_oRbgI8ypA" name="Receive Order" outgoing="_NfIKgAkvEdyF_oRbgI8ypA" incoming="_M5RrcAkvEdyF_oRbgI8ypA _P8pV0AkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_4o7-wAkuEdyF_oRbgI8ypA" name="Fill Order" outgoing="_WaxP0AkvEdyF_oRbgI8ypA" incoming="_9bL-UKTVEdy7eaLHH7_7yw"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_6InBwAkuEdyF_oRbgI8ypA" name="Ship Order" outgoing="_g5f4gAkvEdyF_oRbgI8ypA" incoming="_f_YZoAkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_8M8RAAkuEdyF_oRbgI8ypA" name="Close Order" outgoing="_kYRsgAkvEdyF_oRbgI8ypA" incoming="_ifuPcAkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:InitialNode" xmi:id="_FSuw0AkvEdyF_oRbgI8ypA" outgoing="_P8pV0AkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:MergeNode" xmi:id="_IDUpIAkvEdyF_oRbgI8ypA" outgoing="_9bL-UKTVEdy7eaLHH7_7yw _HKEecKTWEdy7eaLHH7_7yw" incoming="_NfIKgAkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:ForkNode" xmi:id="_UwEokAkvEdyF_oRbgI8ypA" outgoing="_f_YZoAkvEdyF_oRbgI8ypA _3_dHcAkvEdyF_oRbgI8ypA" incoming="_WaxP0AkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:JoinNode" xmi:id="_ZBhPoAkvEdyF_oRbgI8ypA" outgoing="_h1ZgEAkvEdyF_oRbgI8ypA" incoming="_g5f4gAkvEdyF_oRbgI8ypA _8kagYAkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:DecisionNode" xmi:id="_aHQvsAkvEdyF_oRbgI8ypA" outgoing="_ifuPcAkvEdyF_oRbgI8ypA" incoming="_h1ZgEAkvEdyF_oRbgI8ypA _HKEecKTWEdy7eaLHH7_7yw"/>
- <node xmi:type="uml:ActivityFinalNode" xmi:id="_jboeEAkvEdyF_oRbgI8ypA" incoming="_kYRsgAkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_oNj8AAkvEdyF_oRbgI8ypA" name="Send Invoise" outgoing="_6emqcAkvEdyF_oRbgI8ypA" incoming="_3_dHcAkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_p3z3UAkvEdyF_oRbgI8ypA" name="Make Payment" outgoing="_7p28oAkvEdyF_oRbgI8ypA" incoming="_6_FhUAkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:Pin" xmi:id="_toU7kAkvEdyF_oRbgI8ypA" name="Invoice" outgoing="_6_FhUAkvEdyF_oRbgI8ypA" incoming="_6emqcAkvEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_yGJKsAkvEdyF_oRbgI8ypA" name="Accept Payment" outgoing="_8kagYAkvEdyF_oRbgI8ypA" incoming="_7p28oAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_M5RrcAkvEdyF_oRbgI8ypA" source="_5-t7YAktEdyF_oRbgI8ypA" target="_rAsAYAkuEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_NfIKgAkvEdyF_oRbgI8ypA" source="_rAsAYAkuEdyF_oRbgI8ypA" target="_IDUpIAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_P8pV0AkvEdyF_oRbgI8ypA" source="_FSuw0AkvEdyF_oRbgI8ypA" target="_rAsAYAkuEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_WaxP0AkvEdyF_oRbgI8ypA" source="_4o7-wAkuEdyF_oRbgI8ypA" target="_UwEokAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_f_YZoAkvEdyF_oRbgI8ypA" source="_UwEokAkvEdyF_oRbgI8ypA" target="_6InBwAkuEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_g5f4gAkvEdyF_oRbgI8ypA" source="_6InBwAkuEdyF_oRbgI8ypA" target="_ZBhPoAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_h1ZgEAkvEdyF_oRbgI8ypA" source="_ZBhPoAkvEdyF_oRbgI8ypA" target="_aHQvsAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_ifuPcAkvEdyF_oRbgI8ypA" source="_aHQvsAkvEdyF_oRbgI8ypA" target="_8M8RAAkuEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_kYRsgAkvEdyF_oRbgI8ypA" source="_8M8RAAkuEdyF_oRbgI8ypA" target="_jboeEAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_3_dHcAkvEdyF_oRbgI8ypA" source="_UwEokAkvEdyF_oRbgI8ypA" target="_oNj8AAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_6emqcAkvEdyF_oRbgI8ypA" source="_oNj8AAkvEdyF_oRbgI8ypA" target="_toU7kAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_6_FhUAkvEdyF_oRbgI8ypA" source="_toU7kAkvEdyF_oRbgI8ypA" target="_p3z3UAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_7p28oAkvEdyF_oRbgI8ypA" source="_p3z3UAkvEdyF_oRbgI8ypA" target="_yGJKsAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_8kagYAkvEdyF_oRbgI8ypA" source="_yGJKsAkvEdyF_oRbgI8ypA" target="_ZBhPoAkvEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_9bL-UKTVEdy7eaLHH7_7yw" source="_IDUpIAkvEdyF_oRbgI8ypA" target="_4o7-wAkuEdyF_oRbgI8ypA">
- <guard xmi:type="uml:LiteralString" xmi:id="_AS7AcKTWEdy7eaLHH7_7yw" value="order accepted"/>
- </edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_HKEecKTWEdy7eaLHH7_7yw" source="_IDUpIAkvEdyF_oRbgI8ypA" target="_aHQvsAkvEdyF_oRbgI8ypA">
- <guard xmi:type="uml:LiteralString" xmi:id="_NVZ_UKTWEdy7eaLHH7_7yw" value="order rejected"/>
- </edge>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.35.Example of an activity with input parameter.umlactivity_diagram b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.35.Example of an activity with input parameter.umlactivity_diagram
deleted file mode 100644
index e58dd87..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.35.Example of an activity with input parameter.umlactivity_diagram
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_yfGIIAktEdyF_oRbgI8ypA" type="UMLActivity" name="12.35.Example of an activity with input parameter.umlactivity_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_zmLsAAktEdyF_oRbgI8ypA" type="2026">
- <children xmi:type="notation:Node" xmi:id="_zmVdAAktEdyF_oRbgI8ypA" type="5030"/>
- <children xmi:type="notation:Node" xmi:id="_5_A2UAktEdyF_oRbgI8ypA" type="3052">
- <children xmi:type="notation:Node" xmi:id="_5_KnUAktEdyF_oRbgI8ypA" type="5031"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_5_A2UQktEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:ActivityParameterNode" href="12.35.Example of an activity with input parameter.uml#_5-t7YAktEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5_A2UgktEdyF_oRbgI8ypA" x="-51" y="108"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugnUKI-EdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_mugnU6I-EdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnUaI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.35.Example of an activity with input parameter.uml#_rAsAYAkuEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugnUqI-EdyGqNfYOUez1Q" x="84" y="70"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugnVKI-EdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_mugnV6I-EdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnVaI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.35.Example of an activity with input parameter.uml#_4o7-wAkuEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugnVqI-EdyGqNfYOUez1Q" x="264" y="70"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugnWKI-EdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_mugnW6I-EdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnWaI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.35.Example of an activity with input parameter.uml#_6InBwAkuEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugnWqI-EdyGqNfYOUez1Q" x="432" y="70"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugnXKI-EdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_mugnX6I-EdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnXaI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.35.Example of an activity with input parameter.uml#_8M8RAAkuEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugnXqI-EdyGqNfYOUez1Q" x="576" y="154"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugnYKI-EdyGqNfYOUez1Q" type="3035">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnYaI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:InitialNode" href="12.35.Example of an activity with input parameter.uml#_FSuw0AkvEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugnYqI-EdyGqNfYOUez1Q" x="120" y="154"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugnY6I-EdyGqNfYOUez1Q" type="3034">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnZKI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:MergeNode" href="12.35.Example of an activity with input parameter.uml#_IDUpIAkvEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugnZaI-EdyGqNfYOUez1Q" x="192" y="75"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugnZqI-EdyGqNfYOUez1Q" type="3039">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnZ6I-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ForkNode" href="12.35.Example of an activity with input parameter.uml#_UwEokAkvEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugnaKI-EdyGqNfYOUez1Q" x="360" y="70"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugnaaI-EdyGqNfYOUez1Q" type="3040">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnaqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:JoinNode" href="12.35.Example of an activity with input parameter.uml#_ZBhPoAkvEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugna6I-EdyGqNfYOUez1Q" x="552" y="70"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugnbKI-EdyGqNfYOUez1Q" type="3033">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnbaI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:DecisionNode" href="12.35.Example of an activity with input parameter.uml#_aHQvsAkvEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugnbqI-EdyGqNfYOUez1Q" x="600" y="75"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugnb6I-EdyGqNfYOUez1Q" type="3032">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugncKI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ActivityFinalNode" href="12.35.Example of an activity with input parameter.uml#_jboeEAkvEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugncaI-EdyGqNfYOUez1Q" x="600" y="238"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugncqI-EdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_mugndaI-EdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnc6I-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.35.Example of an activity with input parameter.uml#_oNj8AAkvEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugndKI-EdyGqNfYOUez1Q" x="84" y="226"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mugndqI-EdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_mugneaI-EdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mugnd6I-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.35.Example of an activity with input parameter.uml#_p3z3UAkvEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mugneKI-EdyGqNfYOUez1Q" x="264" y="226"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mupxQKI-EdyGqNfYOUez1Q" type="3041">
- <children xmi:type="notation:Node" xmi:id="_muziQKI-EdyGqNfYOUez1Q" type="5024"/>
- <children xmi:type="notation:Node" xmi:id="_mu8sMKI-EdyGqNfYOUez1Q" type="5052">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_mu8sMaI-EdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mupxQaI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:Pin" href="12.35.Example of an activity with input parameter.uml#_toU7kAkvEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mupxQqI-EdyGqNfYOUez1Q" x="192" y="231"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mu8sMqI-EdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_mu8sNaI-EdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mu8sM6I-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.35.Example of an activity with input parameter.uml#_yGJKsAkvEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mu8sNKI-EdyGqNfYOUez1Q" x="396" y="226"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zmLsAQktEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Activity" href="12.35.Example of an activity with input parameter.uml#_zkjUUAktEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zmLsAgktEdyF_oRbgI8ypA" x="72" y="24" width="709" height="349"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_yfGIIQktEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Package" href="12.35.Example of an activity with input parameter.uml#_ydKOcAktEdyF_oRbgI8ypA"/>
- <edges xmi:type="notation:Edge" xmi:id="_w-mXEKI-EdyGqNfYOUez1Q" type="4001" source="_mugnUKI-EdyGqNfYOUez1Q" target="_mugnY6I-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w-mXFKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-mXFaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w-mXFqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-mXF6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w-mXEaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w-mXEqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_NfIKgAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-mXE6I-EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w-wIEKI-EdyGqNfYOUez1Q" type="4001" source="_mugnYKI-EdyGqNfYOUez1Q" target="_mugnUKI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w-wIFKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-wIFaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w-wIFqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-wIF6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w-wIEaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w-wIEqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_P8pV0AkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-wIE6I-EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w-55GKI-EdyGqNfYOUez1Q" type="4001" source="_mugnVKI-EdyGqNfYOUez1Q" target="_mugnZqI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w-55HKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-55HaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w-55HqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-55H6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w-55GaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w-55GqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_WaxP0AkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-55G6I-EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w-55IKI-EdyGqNfYOUez1Q" type="4001" source="_mugnZqI-EdyGqNfYOUez1Q" target="_mugnWKI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w-55JKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-55JaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w-55JqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-55J6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w-55IaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w-55IqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_f_YZoAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-55I6I-EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w-55KKI-EdyGqNfYOUez1Q" type="4001" source="_mugnWKI-EdyGqNfYOUez1Q" target="_mugnaaI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w-55LKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-55LaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w-55LqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-55L6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w-55KaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w-55KqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_g5f4gAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-55K6I-EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w-55MKI-EdyGqNfYOUez1Q" type="4001" source="_mugnaaI-EdyGqNfYOUez1Q" target="_mugnbKI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w-55NKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-55NaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w-55NqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w-55N6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w-55MaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w-55MqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_h1ZgEAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w-55M6I-EdyGqNfYOUez1Q" points="[-2, -9, 16, 68]$[-13, -57, 5, 20]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w_DDAKI-EdyGqNfYOUez1Q" type="4001" source="_mugnbKI-EdyGqNfYOUez1Q" target="_mugnXKI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w_DDBKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_DDBaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w_DDBqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_DDB6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w_DDAaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w_DDAqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_ifuPcAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w_DDA6I-EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w_DDCKI-EdyGqNfYOUez1Q" type="4001" source="_mugnXKI-EdyGqNfYOUez1Q" target="_mugnb6I-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w_DDDKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_DDDaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w_DDDqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_DDD6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w_DDCaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w_DDCqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_kYRsgAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w_DDC6I-EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w_DDGKI-EdyGqNfYOUez1Q" type="4001" source="_mugnZqI-EdyGqNfYOUez1Q" target="_mugncqI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w_DDHKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_DDHaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w_DDHqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_DDH6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w_DDGaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w_DDGqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_3_dHcAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w_DDG6I-EdyGqNfYOUez1Q" points="[2, 7, 240, -149]$[21, 7, 259, -149]$[21, 102, 259, -54]$[-238, 102, 0, -54]$[-238, 131, 0, -25]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w_DDIKI-EdyGqNfYOUez1Q" type="4001" source="_mugndqI-EdyGqNfYOUez1Q" target="_mu8sMqI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w_DDJKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_DDJaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w_DDJqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_DDJ6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w_DDIaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w_DDIqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_7p28oAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w_DDI6I-EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w_DDKKI-EdyGqNfYOUez1Q" type="4001" source="_mu8sMqI-EdyGqNfYOUez1Q" target="_mugnaaI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w_DDLKI-EdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_DDLaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w_DDLqI-EdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_DDL6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w_DDKaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w_DDKqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_8kagYAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w_DDK6I-EdyGqNfYOUez1Q" points="[51, 0, -57, 156]$[77, 0, -31, 156]$[77, -147, -31, 9]$[106, -147, -2, 9]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w_M0AKI-EdyGqNfYOUez1Q" type="4002" source="_5_A2UAktEdyF_oRbgI8ypA" target="_mugnUKI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w_M0BKI-EdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_M0BaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w_M0BqI-EdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_M0B6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w_M0AaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w_M0AqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.35.Example of an activity with input parameter.uml#_M5RrcAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w_M0A6I-EdyGqNfYOUez1Q" points="[-35, -12, 0, 0]$[-35, -12, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w_M0CKI-EdyGqNfYOUez1Q" type="4002" source="_mugncqI-EdyGqNfYOUez1Q" target="_mupxQKI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w_M0DKI-EdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_M0DaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w_M0DqI-EdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_M0D6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w_M0CaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w_M0CqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.35.Example of an activity with input parameter.uml#_6emqcAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w_M0C6I-EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_w_M0EKI-EdyGqNfYOUez1Q" type="4002" source="_mupxQKI-EdyGqNfYOUez1Q" target="_mugndqI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_w_M0FKI-EdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_M0FaI-EdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_w_M0FqI-EdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_w_M0F6I-EdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_w_M0EaI-EdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_w_M0EqI-EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.35.Example of an activity with input parameter.uml#_6_FhUAkvEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w_M0E6I-EdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_9bVvUKTVEdy7eaLHH7_7yw" type="4001" source="_mugnY6I-EdyGqNfYOUez1Q" target="_mugnVKI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_9bVvVKTVEdy7eaLHH7_7yw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9bVvVaTVEdy7eaLHH7_7yw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9bVvVqTVEdy7eaLHH7_7yw" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9bVvV6TVEdy7eaLHH7_7yw" y="60"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9bVvWKTVEdy7eaLHH7_7yw" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9bVvWaTVEdy7eaLHH7_7yw" x="-9" y="43"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_9bVvUaTVEdy7eaLHH7_7yw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_9bVvUqTVEdy7eaLHH7_7yw"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_9bL-UKTVEdy7eaLHH7_7yw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9bVvU6TVEdy7eaLHH7_7yw" points="[5, 2, -37, 0]$[37, 2, -5, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bVvWqTVEdy7eaLHH7_7yw" id="(0.875,0.425)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bVvW6TVEdy7eaLHH7_7yw" id="(0.0625,0.48)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_HKEecaTWEdy7eaLHH7_7yw" type="4001" source="_mugnY6I-EdyGqNfYOUez1Q" target="_mugnbKI-EdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_HKEedaTWEdy7eaLHH7_7yw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HKEedqTWEdy7eaLHH7_7yw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_HKEed6TWEdy7eaLHH7_7yw" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HKEeeKTWEdy7eaLHH7_7yw" y="60"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_HKEeeaTWEdy7eaLHH7_7yw" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HKEeeqTWEdy7eaLHH7_7yw" x="-266" y="4"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_HKEecqTWEdy7eaLHH7_7yw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_HKEec6TWEdy7eaLHH7_7yw"/>
- <element xmi:type="uml:ControlFlow" href="12.35.Example of an activity with input parameter.uml#_HKEecKTWEdy7eaLHH7_7yw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HKEedKTWEdy7eaLHH7_7yw" points="[0, -20, -411, -7]$[0, -58, -411, -45]$[411, -58, 0, -45]$[411, -20, 0, -7]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HKEee6TWEdy7eaLHH7_7yw" id="(0.575,0.175)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.49.Activity final example.uml b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.49.Activity final example.uml
deleted file mode 100644
index 9c4fd58..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.49.Activity final example.uml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_mrDyAAkwEdyF_oRbgI8ypA">
- <packagedElement xmi:type="uml:Activity" xmi:id="_pmhdkAkwEdyF_oRbgI8ypA" name="Activity final example">
- <node xmi:type="uml:InitialNode" xmi:id="_0L8kIAkwEdyF_oRbgI8ypA" outgoing="_qdMKYAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:ActivityFinalNode" xmi:id="_1BcowAkwEdyF_oRbgI8ypA" incoming="_JEUhMAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:ActivityFinalNode" xmi:id="_1YsEEAkwEdyF_oRbgI8ypA" incoming="_Ik4MIAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_91USIAkwEdyF_oRbgI8ypA" name="Publish Proposal" outgoing="_JEUhMAkxEdyF_oRbgI8ypA" incoming="_haNKYKTWEdy7eaLHH7_7yw"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_ARCtsAkxEdyF_oRbgI8ypA" name="Notify of Modification" incoming="_dVpFUAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_BLm4gAkxEdyF_oRbgI8ypA" name="Notify of Rejection" outgoing="_Ik4MIAkxEdyF_oRbgI8ypA" incoming="_iFRgoKTWEdy7eaLHH7_7yw"/>
- <node xmi:type="uml:DecisionNode" xmi:id="_KXxGEAkxEdyF_oRbgI8ypA" outgoing="_govRMKTWEdy7eaLHH7_7yw _haNKYKTWEdy7eaLHH7_7yw _iFRgoKTWEdy7eaLHH7_7yw" incoming="_wIVvUAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:ForkNode" xmi:id="_QizsAAkxEdyF_oRbgI8ypA" outgoing="_dVpFUAkxEdyF_oRbgI8ypA _rsnK4AkxEdyF_oRbgI8ypA" incoming="_govRMKTWEdy7eaLHH7_7yw"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_gYP6sAkxEdyF_oRbgI8ypA" name="Modify Proposal" outgoing="_vQTUEAkxEdyF_oRbgI8ypA" incoming="_utlokAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_jlmAcAkxEdyF_oRbgI8ypA" name="Review Proposal" outgoing="_wIVvUAkxEdyF_oRbgI8ypA" incoming="_vQTUEAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:MergeNode" xmi:id="_n2SZkAkxEdyF_oRbgI8ypA" outgoing="_utlokAkxEdyF_oRbgI8ypA" incoming="_qdMKYAkxEdyF_oRbgI8ypA _rsnK4AkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_Ik4MIAkxEdyF_oRbgI8ypA" source="_BLm4gAkxEdyF_oRbgI8ypA" target="_1YsEEAkwEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_JEUhMAkxEdyF_oRbgI8ypA" source="_91USIAkwEdyF_oRbgI8ypA" target="_1BcowAkwEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_dVpFUAkxEdyF_oRbgI8ypA" source="_QizsAAkxEdyF_oRbgI8ypA" target="_ARCtsAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_qdMKYAkxEdyF_oRbgI8ypA" source="_0L8kIAkwEdyF_oRbgI8ypA" target="_n2SZkAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_rsnK4AkxEdyF_oRbgI8ypA" source="_QizsAAkxEdyF_oRbgI8ypA" target="_n2SZkAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_utlokAkxEdyF_oRbgI8ypA" source="_n2SZkAkxEdyF_oRbgI8ypA" target="_gYP6sAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_vQTUEAkxEdyF_oRbgI8ypA" source="_gYP6sAkxEdyF_oRbgI8ypA" target="_jlmAcAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_wIVvUAkxEdyF_oRbgI8ypA" source="_jlmAcAkxEdyF_oRbgI8ypA" target="_KXxGEAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_govRMKTWEdy7eaLHH7_7yw" source="_KXxGEAkxEdyF_oRbgI8ypA" target="_QizsAAkxEdyF_oRbgI8ypA">
- <guard xmi:type="uml:LiteralString" xmi:id="_m-8lUKTWEdy7eaLHH7_7yw" value="decision = modify"/>
- </edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_haNKYKTWEdy7eaLHH7_7yw" source="_KXxGEAkxEdyF_oRbgI8ypA" target="_91USIAkwEdyF_oRbgI8ypA">
- <guard xmi:type="uml:LiteralString" xmi:id="_ovA0wKTWEdy7eaLHH7_7yw" value="decision = accept"/>
- </edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_iFRgoKTWEdy7eaLHH7_7yw" source="_KXxGEAkxEdyF_oRbgI8ypA" target="_BLm4gAkxEdyF_oRbgI8ypA">
- <guard xmi:type="uml:LiteralString" xmi:id="_rVdSkKTWEdy7eaLHH7_7yw" value="decision = reject"/>
- </edge>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.49.Activity final example.umlactivity_diagram b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.49.Activity final example.umlactivity_diagram
deleted file mode 100644
index 617d489..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.49.Activity final example.umlactivity_diagram
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_mrDyAQkwEdyF_oRbgI8ypA" type="UMLActivity" name="12.49.Activity final example.umlactivity_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_pm0YgAkwEdyF_oRbgI8ypA" type="2026">
- <children xmi:type="notation:Node" xmi:id="_pm0YgwkwEdyF_oRbgI8ypA" type="5030"/>
- <children xmi:type="notation:Node" xmi:id="_02LasKJAEdyGqNfYOUez1Q" type="3035">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LasaJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:InitialNode" href="12.49.Activity final example.uml#_0L8kIAkwEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02LasqJAEdyGqNfYOUez1Q" x="12" y="111"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02Las6JAEdyGqNfYOUez1Q" type="3032">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LatKJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ActivityFinalNode" href="12.49.Activity final example.uml#_1BcowAkwEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02LataJAEdyGqNfYOUez1Q" x="696" y="109"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LatqJAEdyGqNfYOUez1Q" type="3032">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02Lat6JAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ActivityFinalNode" href="12.49.Activity final example.uml#_1YsEEAkwEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02LauKJAEdyGqNfYOUez1Q" x="696" y="178"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LauaJAEdyGqNfYOUez1Q" type="3045">
- <children xmi:type="notation:Node" xmi:id="_02LavKJAEdyGqNfYOUez1Q" type="5028"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LauqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.49.Activity final example.uml#_91USIAkwEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02Lau6JAEdyGqNfYOUez1Q" x="566" y="94"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LavaJAEdyGqNfYOUez1Q" type="3045">
- <children xmi:type="notation:Node" xmi:id="_02LawKJAEdyGqNfYOUez1Q" type="5028"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LavqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.49.Activity final example.uml#_ARCtsAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02Lav6JAEdyGqNfYOUez1Q" x="552" y="22"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LawaJAEdyGqNfYOUez1Q" type="3045">
- <children xmi:type="notation:Node" xmi:id="_02LaxKJAEdyGqNfYOUez1Q" type="5028"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LawqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.49.Activity final example.uml#_BLm4gAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02Law6JAEdyGqNfYOUez1Q" x="558" y="166"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LaxaJAEdyGqNfYOUez1Q" type="3033">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LaxqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:DecisionNode" href="12.49.Activity final example.uml#_KXxGEAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02Lax6JAEdyGqNfYOUez1Q" x="432" y="94"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LayKJAEdyGqNfYOUez1Q" type="3039">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LayaJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ForkNode" href="12.49.Activity final example.uml#_QizsAAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02LayqJAEdyGqNfYOUez1Q" x="432" y="58" width="50" height="4"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02Lay6JAEdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_02LazqJAEdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LazKJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.49.Activity final example.uml#_gYP6sAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02LazaJAEdyGqNfYOUez1Q" x="180" y="94"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02Laz6JAEdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_02La0qJAEdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02La0KJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.49.Activity final example.uml#_jlmAcAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02La0aJAEdyGqNfYOUez1Q" x="312" y="94"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02La06JAEdyGqNfYOUez1Q" type="3034">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02La1KJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:MergeNode" href="12.49.Activity final example.uml#_n2SZkAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02La1aJAEdyGqNfYOUez1Q" x="60" y="99"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_pm0YgQkwEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Activity" href="12.49.Activity final example.uml#_pmhdkAkwEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pm0YggkwEdyF_oRbgI8ypA" x="24" y="36" width="757" height="289"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_mrDyAgkwEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Package" href="12.49.Activity final example.uml#_mrDyAAkwEdyF_oRbgI8ypA"/>
- <edges xmi:type="notation:Edge" xmi:id="_02UkoKJAEdyGqNfYOUez1Q" type="4001" source="_02LawaJAEdyGqNfYOUez1Q" target="_02LatqJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02UkpKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02UkpaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02UkpqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02Ukp6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02UkoaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02UkoqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_Ik4MIAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02Uko6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02eVoKJAEdyGqNfYOUez1Q" type="4001" source="_02LauaJAEdyGqNfYOUez1Q" target="_02Las6JAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02eVpKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVpaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02eVpqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVp6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02eVoaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02eVoqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_JEUhMAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02eVo6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02eVwKJAEdyGqNfYOUez1Q" type="4001" source="_02LayKJAEdyGqNfYOUez1Q" target="_02LavaJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02eVxKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVxaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02eVxqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVx6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02eVwaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02eVwqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_dVpFUAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02eVw6JAEdyGqNfYOUez1Q" points="[7, -2, -89, 18]$[7, -20, -89, 0]$[95, -20, -1, 0]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iTxaAKJBEdyGqNfYOUez1Q" id="(0.0080,0.36)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02eVyKJAEdyGqNfYOUez1Q" type="4001" source="_02LasKJAEdyGqNfYOUez1Q" target="_02La06JAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02eVzKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVzaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02eVzqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVz6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02eVyaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02eVyqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_qdMKYAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02eVy6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02eV0KJAEdyGqNfYOUez1Q" type="4001" source="_02LayKJAEdyGqNfYOUez1Q" target="_02La06JAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02eV1KJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eV1aJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02eV1qJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eV16JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02eV0aJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02eV0qJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_rsnK4AkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02eV06JAEdyGqNfYOUez1Q" points="[-9, -2, 368, -61]$[-9, -20, 368, -79]$[-377, -20, 0, -79]$[-377, 39, 0, -20]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02nfkKJAEdyGqNfYOUez1Q" type="4001" source="_02La06JAEdyGqNfYOUez1Q" target="_02Lay6JAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02nflKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nflaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02nflqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nfl6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02nfkaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02nfkqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_utlokAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02nfk6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02nfmKJAEdyGqNfYOUez1Q" type="4001" source="_02Lay6JAEdyGqNfYOUez1Q" target="_02Laz6JAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02nfnKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nfnaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02nfnqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nfn6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02nfmaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02nfmqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_vQTUEAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02nfm6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02nfoKJAEdyGqNfYOUez1Q" type="4001" source="_02Laz6JAEdyGqNfYOUez1Q" target="_02LaxaJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02nfpKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nfpaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02nfpqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nfp6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02nfoaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02nfoqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_wIVvUAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02nfo6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_go4bIKTWEdy7eaLHH7_7yw" type="4001" source="_02LaxaJAEdyGqNfYOUez1Q" target="_02LayKJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_go4bJKTWEdy7eaLHH7_7yw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_go4bJaTWEdy7eaLHH7_7yw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_go4bJqTWEdy7eaLHH7_7yw" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_go4bJ6TWEdy7eaLHH7_7yw" y="60"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_go4bKKTWEdy7eaLHH7_7yw" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_go4bKaTWEdy7eaLHH7_7yw" x="1" y="-68"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_go4bIaTWEdy7eaLHH7_7yw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_go4bIqTWEdy7eaLHH7_7yw"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_govRMKTWEdy7eaLHH7_7yw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_go4bI6TWEdy7eaLHH7_7yw" points="[0, -2, -6, 34]$[-6, -34, -12, 2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_go4bKqTWEdy7eaLHH7_7yw" id="(0.475,0.05)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_haNKYaTWEdy7eaLHH7_7yw" type="4001" source="_02LaxaJAEdyGqNfYOUez1Q" target="_02LauaJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_haNKZaTWEdy7eaLHH7_7yw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_haNKZqTWEdy7eaLHH7_7yw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_haNKZ6TWEdy7eaLHH7_7yw" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_haNKaKTWEdy7eaLHH7_7yw" y="60"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_haNKaaTWEdy7eaLHH7_7yw" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_haNKaqTWEdy7eaLHH7_7yw" x="-10" y="23"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_haNKYqTWEdy7eaLHH7_7yw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_haNKY6TWEdy7eaLHH7_7yw"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_haNKYKTWEdy7eaLHH7_7yw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_haNKZKTWEdy7eaLHH7_7yw" points="[5, 4, -94, 0]$[99, 4, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_haNKa6TWEdy7eaLHH7_7yw" id="(0.875,0.4)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_haW7YKTWEdy7eaLHH7_7yw" id="(0.0,0.4)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_iFRgoaTWEdy7eaLHH7_7yw" type="4001" source="_02LaxaJAEdyGqNfYOUez1Q" target="_02LawaJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_iFRgpaTWEdy7eaLHH7_7yw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_iFRgpqTWEdy7eaLHH7_7yw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_iFRgp6TWEdy7eaLHH7_7yw" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_iFRgqKTWEdy7eaLHH7_7yw" y="60"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_iFRgqaTWEdy7eaLHH7_7yw" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_iFRgqqTWEdy7eaLHH7_7yw" x="19" y="17"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_iFRgoqTWEdy7eaLHH7_7yw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_iFRgo6TWEdy7eaLHH7_7yw"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_iFRgoKTWEdy7eaLHH7_7yw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iFRgpKTWEdy7eaLHH7_7yw" points="[0, 20, -115, -66]$[0, 78, -115, -8]$[106, 78, -9, -8]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iFRgq6TWEdy7eaLHH7_7yw" id="(0.08035714,0.68)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.59.Activity partition using swimlane example.uml b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.59.Activity partition using swimlane example.uml
deleted file mode 100644
index baefe41..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.59.Activity partition using swimlane example.uml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_w9hnwKI4EdyGqNfYOUez1Q">
- <elementImport xmi:id="_xBPqIKI4EdyGqNfYOUez1Q">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_xBjMIKI4EdyGqNfYOUez1Q">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_xBjMIaI4EdyGqNfYOUez1Q">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_xBjMIqI4EdyGqNfYOUez1Q">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Activity" xmi:id="_hU3k8KJFEdyGqNfYOUez1Q" name="Activity partition using swimlane example">
- <node xmi:type="uml:InitialNode" xmi:id="_3yFY4KJFEdyGqNfYOUez1Q" outgoing="_6FfJcKJGEdyGqNfYOUez1Q" inPartition="_kVigoKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_7rO0sKJFEdyGqNfYOUez1Q" name="Receive Order" outgoing="_7UxAAKJGEdyGqNfYOUez1Q" incoming="_6FfJcKJGEdyGqNfYOUez1Q" inPartition="_kVigoKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:DecisionNode" xmi:id="_CUXE0KJGEdyGqNfYOUez1Q" name="DecisionNode" outgoing="_8O330KJGEdyGqNfYOUez1Q _J4YacKJHEdyGqNfYOUez1Q" incoming="_7UxAAKJGEdyGqNfYOUez1Q" inPartition="_kVigoKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_Dsk08KJGEdyGqNfYOUez1Q" name="Fill Order" outgoing="_95HzIKJGEdyGqNfYOUez1Q" incoming="_8O330KJGEdyGqNfYOUez1Q" inPartition="_kVigoKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:ForkNode" xmi:id="_GRYUAKJGEdyGqNfYOUez1Q" outgoing="_ypGQYKJGEdyGqNfYOUez1Q _2zOugKJGEdyGqNfYOUez1Q" incoming="_95HzIKJGEdyGqNfYOUez1Q" inPartition="_kVigoKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_IbqaQKJGEdyGqNfYOUez1Q" name="Ship Order" outgoing="_4YQyoKJGEdyGqNfYOUez1Q" incoming="_2zOugKJGEdyGqNfYOUez1Q" inPartition="_kVigoKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:JoinNode" xmi:id="_LIE9MKJGEdyGqNfYOUez1Q" outgoing="_DalQkKJHEdyGqNfYOUez1Q" incoming="_vP-_gKJGEdyGqNfYOUez1Q _4YQyoKJGEdyGqNfYOUez1Q" inPartition="_kVigoKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:MergeNode" xmi:id="_MCL1AKJGEdyGqNfYOUez1Q" outgoing="_EHINgKJHEdyGqNfYOUez1Q" incoming="_DalQkKJHEdyGqNfYOUez1Q _J4YacKJHEdyGqNfYOUez1Q" inPartition="_kVigoKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_MzqVQKJGEdyGqNfYOUez1Q" name="Close Order" outgoing="_HzULYKJHEdyGqNfYOUez1Q" incoming="_EHINgKJHEdyGqNfYOUez1Q" inPartition="_kVigoKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_TsIo8KJGEdyGqNfYOUez1Q" name="Send Invoice" outgoing="_ojbn8KJGEdyGqNfYOUez1Q" incoming="_ypGQYKJGEdyGqNfYOUez1Q" inPartition="_oxQeAKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:Pin" xmi:id="_WfGf0KJGEdyGqNfYOUez1Q" name="Invoice" inPartition="_oxQeAKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:Pin" xmi:id="_dyjfUKJGEdyGqNfYOUez1Q" name="Invoice" outgoing="_piw-AKJGEdyGqNfYOUez1Q" incoming="_ojbn8KJGEdyGqNfYOUez1Q" inPartition="_oxQeAKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_hot4kKJGEdyGqNfYOUez1Q" name="Accept Payment" outgoing="_vP-_gKJGEdyGqNfYOUez1Q" incoming="_rBFWIKJGEdyGqNfYOUez1Q" inPartition="_oxQeAKJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_jhafkKJGEdyGqNfYOUez1Q" name="Make Payment" outgoing="_rBFWIKJGEdyGqNfYOUez1Q" incoming="_piw-AKJGEdyGqNfYOUez1Q" inPartition="_tDu_0KJFEdyGqNfYOUez1Q"/>
- <node xmi:type="uml:ActivityFinalNode" xmi:id="_GIeaMKJHEdyGqNfYOUez1Q" incoming="_HzULYKJHEdyGqNfYOUez1Q" inPartition="_kVigoKJFEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_ojbn8KJGEdyGqNfYOUez1Q" source="_TsIo8KJGEdyGqNfYOUez1Q" target="_dyjfUKJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_piw-AKJGEdyGqNfYOUez1Q" source="_dyjfUKJGEdyGqNfYOUez1Q" target="_jhafkKJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_rBFWIKJGEdyGqNfYOUez1Q" source="_jhafkKJGEdyGqNfYOUez1Q" target="_hot4kKJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_vP-_gKJGEdyGqNfYOUez1Q" source="_hot4kKJGEdyGqNfYOUez1Q" target="_LIE9MKJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_ypGQYKJGEdyGqNfYOUez1Q" source="_GRYUAKJGEdyGqNfYOUez1Q" target="_TsIo8KJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_2zOugKJGEdyGqNfYOUez1Q" source="_GRYUAKJGEdyGqNfYOUez1Q" target="_IbqaQKJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_4YQyoKJGEdyGqNfYOUez1Q" source="_IbqaQKJGEdyGqNfYOUez1Q" target="_LIE9MKJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_6FfJcKJGEdyGqNfYOUez1Q" source="_3yFY4KJFEdyGqNfYOUez1Q" target="_7rO0sKJFEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_7UxAAKJGEdyGqNfYOUez1Q" source="_7rO0sKJFEdyGqNfYOUez1Q" target="_CUXE0KJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_8O330KJGEdyGqNfYOUez1Q" source="_CUXE0KJGEdyGqNfYOUez1Q" target="_Dsk08KJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_95HzIKJGEdyGqNfYOUez1Q" source="_Dsk08KJGEdyGqNfYOUez1Q" target="_GRYUAKJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_DalQkKJHEdyGqNfYOUez1Q" source="_LIE9MKJGEdyGqNfYOUez1Q" target="_MCL1AKJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_EHINgKJHEdyGqNfYOUez1Q" source="_MCL1AKJGEdyGqNfYOUez1Q" target="_MzqVQKJGEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_HzULYKJHEdyGqNfYOUez1Q" source="_MzqVQKJGEdyGqNfYOUez1Q" target="_GIeaMKJHEdyGqNfYOUez1Q"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_J4YacKJHEdyGqNfYOUez1Q" source="_CUXE0KJGEdyGqNfYOUez1Q" target="_MCL1AKJGEdyGqNfYOUez1Q"/>
- <group xmi:type="uml:ActivityPartition" xmi:id="_kVigoKJFEdyGqNfYOUez1Q" name="Order Department" node="_3yFY4KJFEdyGqNfYOUez1Q _7rO0sKJFEdyGqNfYOUez1Q _CUXE0KJGEdyGqNfYOUez1Q _Dsk08KJGEdyGqNfYOUez1Q _GRYUAKJGEdyGqNfYOUez1Q _IbqaQKJGEdyGqNfYOUez1Q _LIE9MKJGEdyGqNfYOUez1Q _MCL1AKJGEdyGqNfYOUez1Q _MzqVQKJGEdyGqNfYOUez1Q _GIeaMKJHEdyGqNfYOUez1Q"/>
- <group xmi:type="uml:ActivityPartition" xmi:id="_oxQeAKJFEdyGqNfYOUez1Q" name="Acctg Department" node="_TsIo8KJGEdyGqNfYOUez1Q _WfGf0KJGEdyGqNfYOUez1Q _dyjfUKJGEdyGqNfYOUez1Q _hot4kKJGEdyGqNfYOUez1Q"/>
- <group xmi:type="uml:ActivityPartition" xmi:id="_tDu_0KJFEdyGqNfYOUez1Q" name="Customer" node="_jhafkKJGEdyGqNfYOUez1Q"/>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.59.Activity partition using swimlane example.umlactivity_diagram b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.59.Activity partition using swimlane example.umlactivity_diagram
deleted file mode 100644
index 3aaf073..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.59.Activity partition using swimlane example.umlactivity_diagram
+++ /dev/null
@@ -1,319 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_xG6NQKI4EdyGqNfYOUez1Q" type="UMLActivity" name="12.59.Activity partition using swimlane example.umlactivity_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_hfmOQKJFEdyGqNfYOUez1Q" type="2026">
- <children xmi:type="notation:Node" xmi:id="_hf5JMKJFEdyGqNfYOUez1Q" type="5030"/>
- <children xmi:type="notation:Node" xmi:id="_kV_MkKJFEdyGqNfYOUez1Q" type="3056">
- <children xmi:type="notation:Node" xmi:id="_kWI9kKJFEdyGqNfYOUez1Q" type="5045"/>
- <children xmi:type="notation:Node" xmi:id="_3yPJ4KJFEdyGqNfYOUez1Q" type="3064">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_3yPJ4aJFEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:InitialNode" href="12.59.Activity partition using swimlane example.uml#_3yFY4KJFEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3yPJ4qJFEdyGqNfYOUez1Q" x="24" y="53"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_7rhvoKJFEdyGqNfYOUez1Q" type="3075">
- <children xmi:type="notation:Node" xmi:id="_7rrgoKJFEdyGqNfYOUez1Q" type="5079"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_7rhvoaJFEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.59.Activity partition using swimlane example.uml#_7rO0sKJFEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7rhvoqJFEdyGqNfYOUez1Q" x="82" y="36"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_CUzwwKJGEdyGqNfYOUez1Q" type="3062">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_CUzwwaJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:DecisionNode" href="12.59.Activity partition using swimlane example.uml#_CUXE0KJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CUzwwqJGEdyGqNfYOUez1Q" x="202" y="41"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Dsk08aJGEdyGqNfYOUez1Q" type="3075">
- <children xmi:type="notation:Node" xmi:id="_Dsul8KJGEdyGqNfYOUez1Q" type="5079"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Dsk08qJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.59.Activity partition using swimlane example.uml#_Dsk08KJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Dsk086JGEdyGqNfYOUez1Q" x="281" y="36"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_GRiFAKJGEdyGqNfYOUez1Q" type="3069">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_GRiFAaJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ForkNode" href="12.59.Activity partition using swimlane example.uml#_GRYUAKJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GRiFAqJGEdyGqNfYOUez1Q" x="395" y="36"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Ib98QKJGEdyGqNfYOUez1Q" type="3075">
- <children xmi:type="notation:Node" xmi:id="_IcHGMKJGEdyGqNfYOUez1Q" type="5079"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Ib98QaJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.59.Activity partition using swimlane example.uml#_IbqaQKJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ib98QqJGEdyGqNfYOUez1Q" x="454" y="36"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_LIOHIKJGEdyGqNfYOUez1Q" type="3070">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_LIOHIaJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:JoinNode" href="12.59.Activity partition using swimlane example.uml#_LIE9MKJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LIOHIqJGEdyGqNfYOUez1Q" x="574" y="36"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_MCL1AaJGEdyGqNfYOUez1Q" type="3063">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_MCL1AqJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:MergeNode" href="12.59.Activity partition using swimlane example.uml#_MCL1AKJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MCL1A6JGEdyGqNfYOUez1Q" x="621" y="41"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Mz9QMKJGEdyGqNfYOUez1Q" type="3075">
- <children xmi:type="notation:Node" xmi:id="_Mz9QM6JGEdyGqNfYOUez1Q" type="5079"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Mz9QMaJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.59.Activity partition using swimlane example.uml#_MzqVQKJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Mz9QMqJGEdyGqNfYOUez1Q" x="706" y="36"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_GIeaMaJHEdyGqNfYOUez1Q" type="3061">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_GIeaMqJHEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ActivityFinalNode" href="12.59.Activity partition using swimlane example.uml#_GIeaMKJHEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GIeaM6JHEdyGqNfYOUez1Q" x="814" y="49"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_kV_MkaJFEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ActivityPartition" href="12.59.Activity partition using swimlane example.uml#_kVigoKJFEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kV_MkqJFEdyGqNfYOUez1Q" y="22" height="133"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_oxjY8KJFEdyGqNfYOUez1Q" type="3056">
- <children xmi:type="notation:Node" xmi:id="_oxjY86JFEdyGqNfYOUez1Q" type="5045"/>
- <children xmi:type="notation:Node" xmi:id="_TslU4KJGEdyGqNfYOUez1Q" type="3075">
- <children xmi:type="notation:Node" xmi:id="_TslU46JGEdyGqNfYOUez1Q" type="5079"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_TslU4aJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.59.Activity partition using swimlane example.uml#_TsIo8KJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TslU4qJGEdyGqNfYOUez1Q" x="154" y="36"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_WfZawKJGEdyGqNfYOUez1Q" type="3071">
- <children xmi:type="notation:Node" xmi:id="_WgJBoKJGEdyGqNfYOUez1Q" type="5074"/>
- <children xmi:type="notation:Node" xmi:id="_WgSyoKJGEdyGqNfYOUez1Q" type="5075">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_WgSyoaJGEdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_WfZawaJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:Pin" href="12.59.Activity partition using swimlane example.uml#_WfGf0KJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WfZawqJGEdyGqNfYOUez1Q" x="190" y="120"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_dy2aQKJGEdyGqNfYOUez1Q" type="3071">
- <children xmi:type="notation:Node" xmi:id="_dy2aQ6JGEdyGqNfYOUez1Q" type="5074"/>
- <children xmi:type="notation:Node" xmi:id="_dy2aRKJGEdyGqNfYOUez1Q" type="5075">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_dy2aRaJGEdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_dy2aQaJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:Pin" href="12.59.Activity partition using swimlane example.uml#_dyjfUKJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dy2aQqJGEdyGqNfYOUez1Q" x="306" y="41"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_hpAzgKJGEdyGqNfYOUez1Q" type="3075">
- <children xmi:type="notation:Node" xmi:id="_hpAzg6JGEdyGqNfYOUez1Q" type="5079"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_hpAzgaJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.59.Activity partition using swimlane example.uml#_hot4kKJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hpAzgqJGEdyGqNfYOUez1Q" x="430" y="36"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_oxjY8aJFEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ActivityPartition" href="12.59.Activity partition using swimlane example.uml#_oxQeAKJFEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oxjY8qJFEdyGqNfYOUez1Q" y="154" height="121"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_tECh0KJFEdyGqNfYOUez1Q" type="3056">
- <children xmi:type="notation:Node" xmi:id="_tECh06JFEdyGqNfYOUez1Q" type="5045"/>
- <children xmi:type="notation:Node" xmi:id="_jhuBkKJGEdyGqNfYOUez1Q" type="3075">
- <children xmi:type="notation:Node" xmi:id="_jhuBk6JGEdyGqNfYOUez1Q" type="5079"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_jhuBkaJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.59.Activity partition using swimlane example.uml#_jhafkKJGEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jhuBkqJGEdyGqNfYOUez1Q" x="430" y="36"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_tECh0aJFEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ActivityPartition" href="12.59.Activity partition using swimlane example.uml#_tDu_0KJFEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tECh0qJFEdyGqNfYOUez1Q" y="274" height="109"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_hfmOQaJFEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:Activity" href="12.59.Activity partition using swimlane example.uml#_hU3k8KJFEdyGqNfYOUez1Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hfmOQqJFEdyGqNfYOUez1Q" x="36" y="24" width="877" height="409"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_xG6NQaI4EdyGqNfYOUez1Q"/>
- <element xmi:type="uml:Package" href="12.59.Activity partition using swimlane example.uml#_w9hnwKI4EdyGqNfYOUez1Q"/>
- <edges xmi:type="notation:Edge" xmi:id="_ojbn8aJGEdyGqNfYOUez1Q" type="4002" source="_TslU4KJGEdyGqNfYOUez1Q" target="_dy2aQKJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_ojbn9aJGEdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ojbn9qJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_ojbn96JGEdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ojbn-KJGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_ojbn8qJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_ojbn86JGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.59.Activity partition using swimlane example.uml#_ojbn8KJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ojbn9KJGEdyGqNfYOUez1Q" points="[41, 1, -81, 0]$[112, 2, -10, 1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ojbn-aJGEdyGqNfYOUez1Q" id="(0.20408164,0.525)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_pi6H8KJGEdyGqNfYOUez1Q" type="4002" source="_dy2aQKJGEdyGqNfYOUez1Q" target="_jhuBkKJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_pi6H9KJGEdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_pi6H9aJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_pi6H9qJGEdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_pi6H96JGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_pi6H8aJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_pi6H8qJGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.59.Activity partition using swimlane example.uml#_piw-AKJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_pi6H86JGEdyGqNfYOUez1Q" points="[19, 20, -88, -94]$[100, 113, -7, -1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_pi6H-KJGEdyGqNfYOUez1Q" id="(0.07777778,0.38)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_rBFWIaJGEdyGqNfYOUez1Q" type="4002" source="_jhuBkKJGEdyGqNfYOUez1Q" target="_hpAzgKJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_rBFWJaJGEdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_rBFWJqJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_rBFWJ6JGEdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_rBFWKKJGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_rBFWIqJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_rBFWI6JGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.59.Activity partition using swimlane example.uml#_rBFWIKJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rBFWJKJGEdyGqNfYOUez1Q" points="[3, -3, -92, 82]$[97, -80, 2, 5]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rBFWKaJGEdyGqNfYOUez1Q" id="(0.5888889,0.02)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rBFWKqJGEdyGqNfYOUez1Q" id="(0.56435645,0.9)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_vP-_gaJGEdyGqNfYOUez1Q" type="4001" source="_hpAzgKJGEdyGqNfYOUez1Q" target="_LIOHIKJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_vP-_haJGEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_vP-_hqJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_vP-_h6JGEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_vP-_iKJGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_vP-_gqJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_vP-_g6JGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_vP-_gKJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vP-_hKJGEdyGqNfYOUez1Q" points="[7, 0, -43, 124]$[28, 0, -22, 124]$[28, -118, -22, 6]$[50, -118, 0, 6]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQIwgKJGEdyGqNfYOUez1Q" id="(0.9306931,0.54)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vQIwgaJGEdyGqNfYOUez1Q" id="(0.0,0.7)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_ypGQYaJGEdyGqNfYOUez1Q" type="4001" source="_GRiFAKJGEdyGqNfYOUez1Q" target="_TslU4KJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_ypGQZaJGEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ypGQZqJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_ypGQZ6JGEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ypGQaKJGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_ypGQYqJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_ypGQY6JGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_ypGQYKJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ypGQZKJGEdyGqNfYOUez1Q" points="[2, 9, 212, -101]$[22, 9, 232, -101]$[22, 88, 232, -22]$[-204, 88, 6, -22]$[-204, 107, 6, -3]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ypQBYKJGEdyGqNfYOUez1Q" id="(0.4074074,0.06)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_2zOugaJGEdyGqNfYOUez1Q" type="4001" source="_GRiFAKJGEdyGqNfYOUez1Q" target="_Ib98QKJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_2zOuhaJGEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2zOuhqJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_2zOuh6JGEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_2zOuiKJGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_2zOugqJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_2zOug6JGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_2zOugKJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2zOuhKJGEdyGqNfYOUez1Q" points="[2, -3, -61, 0]$[57, -4, -6, -1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2zOuiaJGEdyGqNfYOUez1Q" id="(0.075,0.44)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_4YQyoaJGEdyGqNfYOUez1Q" type="4001" source="_Ib98QKJGEdyGqNfYOUez1Q" target="_LIOHIKJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_4YQypaJGEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4YQypqJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_4YQyp6JGEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4YQyqKJGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_4YQyoqJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_4YQyo6JGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_4YQyoKJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4YQypKJGEdyGqNfYOUez1Q" points="[2, -7, -42, -11]$[44, -21, 0, -25]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4YajoKJGEdyGqNfYOUez1Q" id="(0.975,0.42)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_6FfJcaJGEdyGqNfYOUez1Q" type="4001" source="_3yPJ4KJFEdyGqNfYOUez1Q" target="_7rhvoKJFEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_6FfJdaJGEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6FfJdqJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6FfJd6JGEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6FfJeKJGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_6FfJcqJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_6FfJc6JGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_6FfJcKJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6FfJdKJGEdyGqNfYOUez1Q" points="[8, 0, -48, 0]$[51, 0, -5, 0]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6Fo6cKJGEdyGqNfYOUez1Q" id="(0.057471264,0.48)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_7UxAAaJGEdyGqNfYOUez1Q" type="4001" source="_7rhvoKJFEdyGqNfYOUez1Q" target="_CUzwwKJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_7UxABaJGEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_7UxABqJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_7UxAB6JGEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_7UxACKJGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_7UxAAqJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_7UxAA6JGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_7UxAAKJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7UxABKJGEdyGqNfYOUez1Q" points="[9, -7, -53, -8]$[56, -19, -6, -20]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7UxACaJGEdyGqNfYOUez1Q" id="(0.8965517,0.48)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_8O330aJGEdyGqNfYOUez1Q" type="4001" source="_CUzwwKJGEdyGqNfYOUez1Q" target="_Dsk08aJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_8O331aJGEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8O331qJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8O3316JGEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8O332KJGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_8O330qJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_8O3306JGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_8O330KJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8O331KJGEdyGqNfYOUez1Q" points="[9, 3, -52, 0]$[48, 3, -13, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8O332aJGEdyGqNfYOUez1Q" id="(0.775,0.4)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8O332qJGEdyGqNfYOUez1Q" id="(0.1625,0.48)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_95HzIaJGEdyGqNfYOUez1Q" type="4001" source="_Dsk08aJGEdyGqNfYOUez1Q" target="_GRiFAKJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_95HzJaJGEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_95HzJqJGEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_95HzJ6JGEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_95HzKKJGEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_95HzIqJGEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_95HzI6JGEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_95HzIKJGEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_95HzJKJGEdyGqNfYOUez1Q" points="[10, 5, -36, 3]$[46, 27, 0, 25]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_95HzKaJGEdyGqNfYOUez1Q" id="(0.875,0.46)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_DalQkaJHEdyGqNfYOUez1Q" type="4001" source="_LIOHIKJGEdyGqNfYOUez1Q" target="_MCL1AaJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_DalQlaJHEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_DalQlqJHEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_DalQl6JHEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_DalQmKJHEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_DalQkqJHEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_DalQk6JHEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_DalQkKJHEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DalQlKJHEdyGqNfYOUez1Q" points="[2, -1, -47, 0]$[45, -1, -4, 0]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DalQmaJHEdyGqNfYOUez1Q" id="(0.1,0.475)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_EHINgaJHEdyGqNfYOUez1Q" type="4001" source="_MCL1AaJGEdyGqNfYOUez1Q" target="_Mz9QMKJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_EHINhaJHEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EHINhqJHEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_EHINh6JHEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_EHINiKJHEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_EHINgqJHEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_EHINg6JHEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_EHINgKJHEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_EHINhKJHEdyGqNfYOUez1Q" points="[8, 2, -64, 0]$[65, 2, -7, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EHINiaJHEdyGqNfYOUez1Q" id="(0.8,0.425)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_EHINiqJHEdyGqNfYOUez1Q" id="(0.0875,0.48)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_HzULYaJHEdyGqNfYOUez1Q" type="4001" source="_Mz9QMKJGEdyGqNfYOUez1Q" target="_GIeaMaJHEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_HzULZaJHEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HzULZqJHEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_HzULZ6JHEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HzULaKJHEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_HzULYqJHEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_HzULY6JHEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_HzULYKJHEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HzULZKJHEdyGqNfYOUez1Q" points="[12, 3, -39, 2]$[40, 3, -11, 2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hzd8YKJHEdyGqNfYOUez1Q" id="(0.85,0.46)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_J4YacaJHEdyGqNfYOUez1Q" type="4001" source="_CUzwwKJGEdyGqNfYOUez1Q" target="_MCL1AaJGEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_J4YadaJHEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_J4YadqJHEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_J4Yad6JHEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_J4YaeKJHEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_J4YacqJHEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_J4Yac6JHEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.59.Activity partition using swimlane example.uml#_J4YacKJHEdyGqNfYOUez1Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_J4YadKJHEdyGqNfYOUez1Q" points="[6, -9, -423, -7]$[6, -35, -423, -33]$[421, -35, -8, -33]$[421, -9, -8, -7]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J4YaeaJHEdyGqNfYOUez1Q" id="(0.375,0.225)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_J4YaeqJHEdyGqNfYOUez1Q" id="(0.625,0.175)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.75.Data store node example.uml b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.75.Data store node example.uml
deleted file mode 100644
index 43a0d73..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.75.Data store node example.uml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_ugR6cAkzEdyF_oRbgI8ypA">
- <packagedElement xmi:type="uml:Activity" xmi:id="_vDANAAkzEdyF_oRbgI8ypA" name="Data store node example">
- <node xmi:type="uml:OpaqueAction" xmi:id="_1YnrQAkzEdyF_oRbgI8ypA" name="Hire Employee" outgoing="_D3CcoAk0EdyF_oRbgI8ypA"/>
- <node xmi:type="uml:DataStoreNode" xmi:id="_2_vaEAkzEdyF_oRbgI8ypA" name="Personnel database" outgoing="_FEiKgAk0EdyF_oRbgI8ypA _Xx3MUAk0EdyF_oRbgI8ypA" incoming="_D3CcoAk0EdyF_oRbgI8ypA"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_7FjY4AkzEdyF_oRbgI8ypA" name="Assign Employee" incoming="_FEiKgAk0EdyF_oRbgI8ypA"/>
- <node xmi:type="uml:AcceptEventAction" xmi:id="_Ja5GwAk0EdyF_oRbgI8ypA" name="Once a year" outgoing="_VR0RcAk0EdyF_oRbgI8ypA">
- <trigger xmi:id="_JbotoAk0EdyF_oRbgI8ypA" event="_Jbx3kAk0EdyF_oRbgI8ypA"/>
- </node>
- <node xmi:type="uml:JoinNode" xmi:id="_OBMjgAk0EdyF_oRbgI8ypA" outgoing="_UXjooAk0EdyF_oRbgI8ypA" incoming="_VR0RcAk0EdyF_oRbgI8ypA _Xx3MUAk0EdyF_oRbgI8ypA"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_TZQ0YAk0EdyF_oRbgI8ypA" name="Review Employee" incoming="_UXjooAk0EdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_D3CcoAk0EdyF_oRbgI8ypA" source="_1YnrQAkzEdyF_oRbgI8ypA" target="_2_vaEAkzEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_FEiKgAk0EdyF_oRbgI8ypA" source="_2_vaEAkzEdyF_oRbgI8ypA" target="_7FjY4AkzEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_UXjooAk0EdyF_oRbgI8ypA" source="_OBMjgAk0EdyF_oRbgI8ypA" target="_TZQ0YAk0EdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_VR0RcAk0EdyF_oRbgI8ypA" source="_Ja5GwAk0EdyF_oRbgI8ypA" target="_OBMjgAk0EdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ObjectFlow" xmi:id="_Xx3MUAk0EdyF_oRbgI8ypA" source="_2_vaEAkzEdyF_oRbgI8ypA" target="_OBMjgAk0EdyF_oRbgI8ypA">
- <weight xmi:type="uml:LiteralString" xmi:id="_9eDvIKJDEdyGqNfYOUez1Q" value="all"/>
- </edge>
- </packagedElement>
- <packagedElement xmi:type="uml:TimeEvent" xmi:id="_Jbx3kAk0EdyF_oRbgI8ypA"/>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.75.Data store node example.umlactivity_diagram b/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.75.Data store node example.umlactivity_diagram
deleted file mode 100644
index 4682854..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/examples/12.75.Data store node example.umlactivity_diagram
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_ugR6cQkzEdyF_oRbgI8ypA" type="UMLActivity" name="12.75.Data store node example.umlactivity_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_vDJ-AAkzEdyF_oRbgI8ypA" type="2026">
- <children xmi:type="notation:Node" xmi:id="_vDJ-AwkzEdyF_oRbgI8ypA" type="5030"/>
- <children xmi:type="notation:Node" xmi:id="_6V4IIKJBEdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_6V4II6JBEdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_6V4IIaJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.75.Data store node example.uml#_1YnrQAkzEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6V4IIqJBEdyGqNfYOUez1Q" x="24" y="46"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6V4IJKJBEdyGqNfYOUez1Q" type="3036">
- <children xmi:type="notation:Node" xmi:id="_6V4IJ6JBEdyGqNfYOUez1Q" type="5034"/>
- <children xmi:type="notation:Node" xmi:id="_6V4IKKJBEdyGqNfYOUez1Q" type="5036"/>
- <children xmi:type="notation:Node" xmi:id="_6V4IKaJBEdyGqNfYOUez1Q" type="5051">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6V4IKqJBEdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_6V4IJaJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:DataStoreNode" href="12.75.Data store node example.uml#_2_vaEAkzEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6V4IJqJBEdyGqNfYOUez1Q" x="156" y="46"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6V4IK6JBEdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_6V4ILqJBEdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_6V4ILKJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.75.Data store node example.uml#_7FjY4AkzEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6V4ILaJBEdyGqNfYOUez1Q" x="168" y="154"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6V4IL6JBEdyGqNfYOUez1Q" type="3031">
- <children xmi:type="notation:Node" xmi:id="_6V4IMqJBEdyGqNfYOUez1Q" type="5042">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6V4IM6JBEdyGqNfYOUez1Q" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_6V4IMKJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:AcceptEventAction" href="12.75.Data store node example.uml#_Ja5GwAk0EdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6V4IMaJBEdyGqNfYOUez1Q" x="372" y="142"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6V4INKJBEdyGqNfYOUez1Q" type="3040">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_6V4INaJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:JoinNode" href="12.75.Data store node example.uml#_OBMjgAk0EdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6V4INqJBEdyGqNfYOUez1Q" x="492" y="58"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6V4IN6JBEdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_6V4IOqJBEdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_6V4IOKJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.75.Data store node example.uml#_TZQ0YAk0EdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6V4IOaJBEdyGqNfYOUez1Q" x="552" y="58"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_vDJ-AQkzEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Activity" href="12.75.Data store node example.uml#_vDANAAkzEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vDJ-AgkzEdyF_oRbgI8ypA" x="36" y="36" width="735" height="277"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_ugR6cgkzEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Package" href="12.75.Data store node example.uml#_ugR6cAkzEdyF_oRbgI8ypA"/>
- <edges xmi:type="notation:Edge" xmi:id="_6WBSEKJBEdyGqNfYOUez1Q" type="4001" source="_6V4INKJBEdyGqNfYOUez1Q" target="_6V4IN6JBEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_6WBSFKJBEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6WBSFaJBEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6WBSFqJBEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6WBSF6JBEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_6WBSEaJBEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_6WBSEqJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.75.Data store node example.uml#_UXjooAk0EdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6WBSE6JBEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_6WBSGKJBEdyGqNfYOUez1Q" type="4001" source="_6V4IL6JBEdyGqNfYOUez1Q" target="_6V4INKJBEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_6WBSHKJBEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6WBSHaJBEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6WBSHqJBEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6WBSH6JBEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_6WBSGaJBEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_6WBSGqJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.75.Data store node example.uml#_VR0RcAk0EdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6WBSG6JBEdyGqNfYOUez1Q" points="[0, -25, -82, 59]$[0, -77, -82, 7]$[80, -77, -2, 7]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_6WLDEKJBEdyGqNfYOUez1Q" type="4002" source="_6V4IIKJBEdyGqNfYOUez1Q" target="_6V4IJKJBEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_6WLDFKJBEdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6WLDFaJBEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6WLDFqJBEdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6WLDF6JBEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_6WLDEaJBEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_6WLDEqJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.75.Data store node example.uml#_D3CcoAk0EdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6WLDE6JBEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_6WLDGKJBEdyGqNfYOUez1Q" type="4002" source="_6V4IJKJBEdyGqNfYOUez1Q" target="_6V4IK6JBEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_6WLDHKJBEdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6WLDHaJBEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6WLDHqJBEdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6WLDH6JBEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_6WLDGaJBEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_6WLDGqJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.75.Data store node example.uml#_FEiKgAk0EdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6WLDG6JBEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_6WLDIKJBEdyGqNfYOUez1Q" type="4002" source="_6V4IJKJBEdyGqNfYOUez1Q" target="_6V4INKJBEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_6WLDJKJBEdyGqNfYOUez1Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6WLDJaJBEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6WLDJqJBEdyGqNfYOUez1Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6WLDJ6JBEdyGqNfYOUez1Q" x="-24" y="-21"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_6WLDIaJBEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_6WLDIqJBEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ObjectFlow" href="12.75.Data store node example.uml#_Xx3MUAk0EdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6WLDI6JBEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/plugin.properties b/tests/org.eclipse.uml2.diagram.activity.tests/plugin.properties
deleted file mode 100644
index 5dfaf41..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 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
-###############################################################################
-plugin.provider-name = Eclipse.org
-plugin.name = Activity Tests Plug-in (Incubation)
\ No newline at end of file
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/plugin.xml b/tests/org.eclipse.uml2.diagram.activity.tests/plugin.xml
deleted file mode 100644
index 4e30924..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- Copyright (c) 2006, 2007 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:
- Sergey Gribovsky (Borland) - initial API and implementation
--->
-
-<plugin>
-</plugin>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/ActivityDiagramFacade.java b/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/ActivityDiagramFacade.java
deleted file mode 100644
index 5356f77..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/ActivityDiagramFacade.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.uml2.diagram.activity.tests;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.uml2.diagram.activity.part.UMLDiagramEditorUtil;
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-
-
-public class ActivityDiagramFacade extends UMLDiagramFacade {
-
- public ActivityDiagramFacade(String path) {
- super(path, DIAGRAM_FILE_EXTENSION);
- }
-
- @Override
- protected Resource createDiagram(URI diagramModelURI, URI domainModelURI) {
- return UMLDiagramEditorUtil.createDiagram(diagramModelURI, domainModelURI, new NullProgressMonitor());
- }
-
- private static final String DIAGRAM_FILE_EXTENSION = "umlactivity_diagram"; //$NON-NLS-1$
-
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/AllNonUITests.java b/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/AllNonUITests.java
deleted file mode 100644
index 30e08aa..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/AllNonUITests.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.uml2.diagram.activity.tests;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.uml2.diagram.common.tests.FakeNonUITest;
-
-
-public class AllNonUITests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.uml2.diagram.statemachine"); //$NON-NLS-1$
- //$JUnit-BEGIN$
- suite.addTestSuite(FakeNonUITest.class);
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/AllTests.java b/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/AllTests.java
deleted file mode 100644
index c310ebc..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/AllTests.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2007 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:
- * Sergey Gribovsky (Borland) - initial API and implementation
- */
-
-package org.eclipse.uml2.diagram.activity.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.uml2.diagram.activity.tests.tools.CreationToolTest;
-import org.eclipse.uml2.diagram.activity.tests.wholediagram.TestWholeDiagramSuite;
-
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.uml2.diagram.activity"); //$NON-NLS-1$
- //$JUnit-BEGIN$
- suite.addTestSuite(CreationToolTest.class);
- suite.addTest(new TestWholeDiagramSuite());
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/tools/CreationToolTest.java b/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/tools/CreationToolTest.java
deleted file mode 100644
index 57bcf20..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/tools/CreationToolTest.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * Copyright (c) 2007 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:
- * Sergey Gribovsky (Borland) - initial API and implementation
- */
-
-package org.eclipse.uml2.diagram.activity.tests.tools;
-
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.AcceptEventActionEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.ActivityEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.ActivityFinalNodeEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.ActivityParameterNodeEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.AddStructuralFeatureValueActionEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.CallBehaviorActionEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.CallOperationActionEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.CentralBufferNodeEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.CreateObjectActionEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.DataStoreNodeEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.DecisionNodeEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.FlowFinalNodeEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.ForkNodeEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.InitialNodeEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.JoinNodeEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.MergeNodeEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.OpaqueActionEditPart;
-import org.eclipse.uml2.diagram.activity.edit.parts.SendSignalActionEditPart;
-import org.eclipse.uml2.diagram.activity.part.UMLVisualIDRegistry;
-import org.eclipse.uml2.diagram.activity.providers.UMLElementTypes;
-import org.eclipse.uml2.diagram.activity.tests.ActivityDiagramFacade;
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.common.tool.CreationToolTestBase;
-
-
-public class CreationToolTest extends CreationToolTestBase {
-
- public CreationToolTest() {
- super("Testing element creation by tools"); //$NON-NLS-1$
- }
-
- public void test_rootEditPart() {
- assertNotNull("Root edit part is NULL", getDiagramEditPart()); //$NON-NLS-1$
- }
-
- public void test_activityCreation() {
- createNodeByTool(UMLElementTypes.Activity_2026, 10, 10);
-
- IGraphicalEditPart activityEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityEditPart.VISUAL_ID));
- assertNotNull("Activity edit part was not found.", activityEditPart); //$NON-NLS-1$
-
- UMLDiagramFacade.flushEventQueue();
- }
-
- public void test_activityParameterNodeCreation() {
- createNodeByTool(UMLElementTypes.Activity_2026, 10, 10);
-
- IGraphicalEditPart activityEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityEditPart.VISUAL_ID));
- assertNotNull("Activity edit part was not found.", activityEditPart); //$NON-NLS-1$
-
- UMLDiagramFacade.flushEventQueue();
- Rectangle activityBounds = activityEditPart.getFigure().getBounds();
-
- createNodeByTool(UMLElementTypes.ActivityParameterNode_3052, activityBounds.x + 20, activityBounds.y + 5);
- IGraphicalEditPart activityParameterNodeEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityParameterNodeEditPart.VISUAL_ID));
- assertNotNull("Activity parameter node edit part was not found.", activityParameterNodeEditPart); //$NON-NLS-1$
- }
-
- public void test_objectNodesCreation() {
- createNodeByTool(UMLElementTypes.Activity_2026, 10, 10);
-
- IGraphicalEditPart activityEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityEditPart.VISUAL_ID));
- assertNotNull("Activity edit part was not found.", activityEditPart); //$NON-NLS-1$
-
- UMLDiagramFacade.flushEventQueue();
- Rectangle activityBounds = activityEditPart.getFigure().getBounds();
-
- createNodeByTool(UMLElementTypes.CentralBufferNode_3037, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart centralBufferNodeEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(CentralBufferNodeEditPart.VISUAL_ID));
- assertNotNull("Central buffer node edit part was not found.", centralBufferNodeEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.DataStoreNode_3036, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart dataStoreNodeEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(DataStoreNodeEditPart.VISUAL_ID));
- assertNotNull("Data store node edit part was not found.", dataStoreNodeEditPart); //$NON-NLS-1$
- }
-
- public void test_controlNodesCreation() {
- createNodeByTool(UMLElementTypes.Activity_2026, 10, 10);
-
- IGraphicalEditPart activityEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityEditPart.VISUAL_ID));
- assertNotNull("Activity edit part was not found.", activityEditPart); //$NON-NLS-1$
-
- UMLDiagramFacade.flushEventQueue();
- Rectangle activityBounds = activityEditPart.getFigure().getBounds();
-
- createNodeByTool(UMLElementTypes.InitialNode_3035, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart initialNodeEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(InitialNodeEditPart.VISUAL_ID));
- assertNotNull("Initial node edit part was not found.", initialNodeEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.ActivityFinalNode_3032, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart finalNodeEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityFinalNodeEditPart.VISUAL_ID));
- assertNotNull("Final node edit part was not found.", finalNodeEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.FlowFinalNode_3038, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart flowFinalNodeEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(FlowFinalNodeEditPart.VISUAL_ID));
- assertNotNull("Flow Final node edit part was not found.", flowFinalNodeEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.MergeNode_3034, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart mergeNodeEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(MergeNodeEditPart.VISUAL_ID));
- assertNotNull("Merge node edit part was not found.", mergeNodeEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.DecisionNode_3033, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart decisionNodeEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(DecisionNodeEditPart.VISUAL_ID));
- assertNotNull("Merge node edit part was not found.", decisionNodeEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.ForkNode_3039, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart forkNodeEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ForkNodeEditPart.VISUAL_ID));
- assertNotNull("Merge node edit part was not found.", forkNodeEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.JoinNode_3040, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart joinNodeEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(JoinNodeEditPart.VISUAL_ID));
- assertNotNull("Join node edit part was not found.", joinNodeEditPart); //$NON-NLS-1$
- }
-
- public void test_actionsCreation() {
- createNodeByTool(UMLElementTypes.Activity_2026, 10, 10);
-
- IGraphicalEditPart activityEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(ActivityEditPart.VISUAL_ID));
- assertNotNull("Activity edit part was not found.", activityEditPart); //$NON-NLS-1$
-
- UMLDiagramFacade.flushEventQueue();
- Rectangle activityBounds = activityEditPart.getFigure().getBounds();
-
- createNodeByTool(UMLElementTypes.AcceptEventAction_3030, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart acceptEventActionEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(AcceptEventActionEditPart.VISUAL_ID));
- assertNotNull("Accept Event action edit part was not found.", acceptEventActionEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.AddStructuralFeatureValueAction_3043, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart addFeatureActionEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(AddStructuralFeatureValueActionEditPart.VISUAL_ID));
- assertNotNull("Add Structural Feature action edit part was not found.", addFeatureActionEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.CallBehaviorAction_3044, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart callBehaviorActionEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(CallBehaviorActionEditPart.VISUAL_ID));
- assertNotNull("Call Behavior action edit part was not found.", callBehaviorActionEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.CallOperationAction_3045, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart callOperationActionEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(CallOperationActionEditPart.VISUAL_ID));
- assertNotNull("Call Operation action edit part was not found.", callOperationActionEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.CreateObjectAction_3042, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart createObjectActionEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(CreateObjectActionEditPart.VISUAL_ID));
- assertNotNull("Create Object action edit part was not found.", createObjectActionEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.OpaqueAction_3029, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart opaqueActionEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(OpaqueActionEditPart.VISUAL_ID));
- assertNotNull("Opaque action edit part was not found.", opaqueActionEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.SendSignalAction_3053, activityBounds.x + 50, activityBounds.y + 50);
- IGraphicalEditPart sendSignalActionEditPart =
- activityEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(SendSignalActionEditPart.VISUAL_ID));
- assertNotNull("Send Signal action edit part was not found.", sendSignalActionEditPart); //$NON-NLS-1$
- }
-
- @Override
- protected UMLDiagramFacade getDiagram(String projectPath) {
- return new ActivityDiagramFacade(projectPath);
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/wholediagram/TestWholeActivityDiagram.java b/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/wholediagram/TestWholeActivityDiagram.java
deleted file mode 100644
index c5ea71d..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/wholediagram/TestWholeActivityDiagram.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.eclipse.uml2.diagram.activity.tests.wholediagram;
-
-import java.net.URL;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.uml2.diagram.activity.edit.parts.PackageEditPart;
-import org.eclipse.uml2.diagram.activity.part.UMLDiagramEditor;
-import org.eclipse.uml2.diagram.activity.part.UMLDiagramEditorPlugin;
-import org.eclipse.uml2.diagram.common.wholediagram.UMLInitDiagramFacade;
-import org.osgi.framework.Bundle;
-
-public class TestWholeActivityDiagram extends org.eclipse.uml2.diagram.common.wholediagram.TestWholeDiagram {
-
- public TestWholeActivityDiagram(String modelFileName, String diagramFileName) {
- super(modelFileName, diagramFileName);
- }
-
- @Override
- protected UMLInitDiagramFacade getInitDiagramFacade(IFile modelFile, IFile diagramFile) {
- return new UMLInitDiagramFacade(modelFile, diagramFile, UMLDiagramEditor.ID) {
-
- @Override
- protected Diagram createDiagramView(EObject modelRoot) {
- return ViewService.createDiagram(modelRoot, PackageEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
- }
- };
- }
-
- @Override
- protected URL findFileInTestPlugin(String fileName) {
- return FileLocator.find(UML_TEST_BUNDLE, new Path(EXAMPLE_FOLDER).append(fileName), Collections.EMPTY_MAP);
- }
-
- private final static Bundle UML_TEST_BUNDLE = Platform.getBundle("org.eclipse.uml2.diagram.activity.tests");
-
- private final static String EXAMPLE_FOLDER = "examples/";
-}
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/wholediagram/TestWholeDiagramSuite.java b/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/wholediagram/TestWholeDiagramSuite.java
deleted file mode 100644
index 172a784..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/src/org/eclipse/uml2/diagram/activity/tests/wholediagram/TestWholeDiagramSuite.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.uml2.diagram.activity.tests.wholediagram;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-public class TestWholeDiagramSuite extends TestSuite {
-
- public TestWholeDiagramSuite() {
- for (String name : oursDiagramFiles) {
- addTest(new TestWholeActivityDiagram(name + ".uml", name + ".umlactivity_diagram"));
- }
-
- }
-
- private static List<String> oursDiagramFiles = new ArrayList<String>();
- static {
- oursDiagramFiles.add("12.115.Object node notations");
- oursDiagramFiles.add("12.126.Pin examples");
- oursDiagramFiles.add("12.35.Example of an activity with input parameter");
- oursDiagramFiles.add("12.49.Activity final example");
- oursDiagramFiles.add("12.59.Activity partition using swimlane example");
- oursDiagramFiles.add("12.75.Data store node example");
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/test.xml b/tests/org.eclipse.uml2.diagram.activity.tests/test.xml
deleted file mode 100644
index 20017b9..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<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.uml2.diagram.activity.tests"/>
- <property name="library-file" value="${eclipse-home}/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="uml2-tools-folder" value="${eclipse-home}/uml2_tools_folder"/>
- <delete dir="${uml2-tools-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${uml2-tools-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.uml2.diagram.activity.tests.AllNonUITests"/>
- <property name="vmargs" value="-ea -Xmx512M"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/testDiagrams/12.49.Activity final example.uml b/tests/org.eclipse.uml2.diagram.activity.tests/testDiagrams/12.49.Activity final example.uml
deleted file mode 100644
index 9c4fd58..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/testDiagrams/12.49.Activity final example.uml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_mrDyAAkwEdyF_oRbgI8ypA">
- <packagedElement xmi:type="uml:Activity" xmi:id="_pmhdkAkwEdyF_oRbgI8ypA" name="Activity final example">
- <node xmi:type="uml:InitialNode" xmi:id="_0L8kIAkwEdyF_oRbgI8ypA" outgoing="_qdMKYAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:ActivityFinalNode" xmi:id="_1BcowAkwEdyF_oRbgI8ypA" incoming="_JEUhMAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:ActivityFinalNode" xmi:id="_1YsEEAkwEdyF_oRbgI8ypA" incoming="_Ik4MIAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_91USIAkwEdyF_oRbgI8ypA" name="Publish Proposal" outgoing="_JEUhMAkxEdyF_oRbgI8ypA" incoming="_haNKYKTWEdy7eaLHH7_7yw"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_ARCtsAkxEdyF_oRbgI8ypA" name="Notify of Modification" incoming="_dVpFUAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:CallOperationAction" xmi:id="_BLm4gAkxEdyF_oRbgI8ypA" name="Notify of Rejection" outgoing="_Ik4MIAkxEdyF_oRbgI8ypA" incoming="_iFRgoKTWEdy7eaLHH7_7yw"/>
- <node xmi:type="uml:DecisionNode" xmi:id="_KXxGEAkxEdyF_oRbgI8ypA" outgoing="_govRMKTWEdy7eaLHH7_7yw _haNKYKTWEdy7eaLHH7_7yw _iFRgoKTWEdy7eaLHH7_7yw" incoming="_wIVvUAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:ForkNode" xmi:id="_QizsAAkxEdyF_oRbgI8ypA" outgoing="_dVpFUAkxEdyF_oRbgI8ypA _rsnK4AkxEdyF_oRbgI8ypA" incoming="_govRMKTWEdy7eaLHH7_7yw"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_gYP6sAkxEdyF_oRbgI8ypA" name="Modify Proposal" outgoing="_vQTUEAkxEdyF_oRbgI8ypA" incoming="_utlokAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:OpaqueAction" xmi:id="_jlmAcAkxEdyF_oRbgI8ypA" name="Review Proposal" outgoing="_wIVvUAkxEdyF_oRbgI8ypA" incoming="_vQTUEAkxEdyF_oRbgI8ypA"/>
- <node xmi:type="uml:MergeNode" xmi:id="_n2SZkAkxEdyF_oRbgI8ypA" outgoing="_utlokAkxEdyF_oRbgI8ypA" incoming="_qdMKYAkxEdyF_oRbgI8ypA _rsnK4AkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_Ik4MIAkxEdyF_oRbgI8ypA" source="_BLm4gAkxEdyF_oRbgI8ypA" target="_1YsEEAkwEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_JEUhMAkxEdyF_oRbgI8ypA" source="_91USIAkwEdyF_oRbgI8ypA" target="_1BcowAkwEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_dVpFUAkxEdyF_oRbgI8ypA" source="_QizsAAkxEdyF_oRbgI8ypA" target="_ARCtsAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_qdMKYAkxEdyF_oRbgI8ypA" source="_0L8kIAkwEdyF_oRbgI8ypA" target="_n2SZkAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_rsnK4AkxEdyF_oRbgI8ypA" source="_QizsAAkxEdyF_oRbgI8ypA" target="_n2SZkAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_utlokAkxEdyF_oRbgI8ypA" source="_n2SZkAkxEdyF_oRbgI8ypA" target="_gYP6sAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_vQTUEAkxEdyF_oRbgI8ypA" source="_gYP6sAkxEdyF_oRbgI8ypA" target="_jlmAcAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_wIVvUAkxEdyF_oRbgI8ypA" source="_jlmAcAkxEdyF_oRbgI8ypA" target="_KXxGEAkxEdyF_oRbgI8ypA"/>
- <edge xmi:type="uml:ControlFlow" xmi:id="_govRMKTWEdy7eaLHH7_7yw" source="_KXxGEAkxEdyF_oRbgI8ypA" target="_QizsAAkxEdyF_oRbgI8ypA">
- <guard xmi:type="uml:LiteralString" xmi:id="_m-8lUKTWEdy7eaLHH7_7yw" value="decision = modify"/>
- </edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_haNKYKTWEdy7eaLHH7_7yw" source="_KXxGEAkxEdyF_oRbgI8ypA" target="_91USIAkwEdyF_oRbgI8ypA">
- <guard xmi:type="uml:LiteralString" xmi:id="_ovA0wKTWEdy7eaLHH7_7yw" value="decision = accept"/>
- </edge>
- <edge xmi:type="uml:ControlFlow" xmi:id="_iFRgoKTWEdy7eaLHH7_7yw" source="_KXxGEAkxEdyF_oRbgI8ypA" target="_BLm4gAkxEdyF_oRbgI8ypA">
- <guard xmi:type="uml:LiteralString" xmi:id="_rVdSkKTWEdy7eaLHH7_7yw" value="decision = reject"/>
- </edge>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.activity.tests/testDiagrams/12.49.Activity final example.umlactivity_diagram b/tests/org.eclipse.uml2.diagram.activity.tests/testDiagrams/12.49.Activity final example.umlactivity_diagram
deleted file mode 100644
index 02d029e..0000000
--- a/tests/org.eclipse.uml2.diagram.activity.tests/testDiagrams/12.49.Activity final example.umlactivity_diagram
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_mrDyAQkwEdyF_oRbgI8ypA" type="UMLActivity" name="12.49.Activity final example.umlactivity_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_pm0YgAkwEdyF_oRbgI8ypA" type="2026">
- <children xmi:type="notation:Node" xmi:id="_pm0YgwkwEdyF_oRbgI8ypA" type="5030"/>
- <children xmi:type="notation:Node" xmi:id="_02LasKJAEdyGqNfYOUez1Q" type="3035">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LasaJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:InitialNode" href="12.49.Activity final example.uml#_0L8kIAkwEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02LasqJAEdyGqNfYOUez1Q" x="12" y="111"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02Las6JAEdyGqNfYOUez1Q" type="3032">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LatKJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ActivityFinalNode" href="12.49.Activity final example.uml#_1BcowAkwEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02LataJAEdyGqNfYOUez1Q" x="696" y="109"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LatqJAEdyGqNfYOUez1Q" type="3032">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02Lat6JAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ActivityFinalNode" href="12.49.Activity final example.uml#_1YsEEAkwEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02LauKJAEdyGqNfYOUez1Q" x="696" y="178"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LauaJAEdyGqNfYOUez1Q" type="3045">
- <children xmi:type="notation:Node" xmi:id="_02LavKJAEdyGqNfYOUez1Q" type="5028"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LauqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.49.Activity final example.uml#_91USIAkwEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02Lau6JAEdyGqNfYOUez1Q" x="566" y="94"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LavaJAEdyGqNfYOUez1Q" type="3045">
- <children xmi:type="notation:Node" xmi:id="_02LawKJAEdyGqNfYOUez1Q" type="5028"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LavqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.49.Activity final example.uml#_ARCtsAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02Lav6JAEdyGqNfYOUez1Q" x="552" y="22"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LawaJAEdyGqNfYOUez1Q" type="3045">
- <children xmi:type="notation:Node" xmi:id="_02LaxKJAEdyGqNfYOUez1Q" type="5028"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LawqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:CallOperationAction" href="12.49.Activity final example.uml#_BLm4gAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02Law6JAEdyGqNfYOUez1Q" x="558" y="166"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LaxaJAEdyGqNfYOUez1Q" type="3033">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LaxqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:DecisionNode" href="12.49.Activity final example.uml#_KXxGEAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02Lax6JAEdyGqNfYOUez1Q" x="432" y="94"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02LayKJAEdyGqNfYOUez1Q" type="3039">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LayaJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ForkNode" href="12.49.Activity final example.uml#_QizsAAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02LayqJAEdyGqNfYOUez1Q" x="432" y="58" width="50" height="4"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02Lay6JAEdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_02LazqJAEdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02LazKJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.49.Activity final example.uml#_gYP6sAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02LazaJAEdyGqNfYOUez1Q" x="180" y="94"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02Laz6JAEdyGqNfYOUez1Q" type="3029">
- <children xmi:type="notation:Node" xmi:id="_02La0qJAEdyGqNfYOUez1Q" type="5023"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02La0KJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:OpaqueAction" href="12.49.Activity final example.uml#_jlmAcAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02La0aJAEdyGqNfYOUez1Q" x="312" y="94"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02La06JAEdyGqNfYOUez1Q" type="3034">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_02La1KJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:MergeNode" href="12.49.Activity final example.uml#_n2SZkAkxEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_02La1aJAEdyGqNfYOUez1Q" x="60" y="99"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_pm0YgQkwEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Activity" href="12.49.Activity final example.uml#_pmhdkAkwEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pm0YggkwEdyF_oRbgI8ypA" x="24" y="36" width="757" height="289"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_mrDyAgkwEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Package" href="12.49.Activity final example.uml#_mrDyAAkwEdyF_oRbgI8ypA"/>
- <edges xmi:type="notation:Edge" xmi:id="_02UkoKJAEdyGqNfYOUez1Q" type="4001" source="_02LawaJAEdyGqNfYOUez1Q" target="_02LatqJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02UkpKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02UkpaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02UkpqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02Ukp6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02UkoaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02UkoqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_Ik4MIAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02Uko6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02eVoKJAEdyGqNfYOUez1Q" type="4001" source="_02LauaJAEdyGqNfYOUez1Q" target="_02Las6JAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02eVpKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVpaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02eVpqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVp6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02eVoaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02eVoqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_JEUhMAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02eVo6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02eVwKJAEdyGqNfYOUez1Q" type="4001" source="_02LayKJAEdyGqNfYOUez1Q" target="_02LavaJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02eVxKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVxaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02eVxqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVx6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02eVwaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02eVwqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_dVpFUAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02eVw6JAEdyGqNfYOUez1Q" points="[7, -2, -89, 18]$[7, -20, -89, 0]$[95, -20, -1, 0]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iTxaAKJBEdyGqNfYOUez1Q" id="(0.0080,0.36)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02eVyKJAEdyGqNfYOUez1Q" type="4001" source="_02LasKJAEdyGqNfYOUez1Q" target="_02La06JAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02eVzKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVzaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02eVzqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eVz6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02eVyaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02eVyqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_qdMKYAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02eVy6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02eV0KJAEdyGqNfYOUez1Q" type="4001" source="_02LayKJAEdyGqNfYOUez1Q" target="_02La06JAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02eV1KJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eV1aJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02eV1qJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02eV16JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02eV0aJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02eV0qJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_rsnK4AkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02eV06JAEdyGqNfYOUez1Q" points="[-9, -2, 368, -61]$[-9, -20, 368, -79]$[-377, -20, 0, -79]$[-377, 39, 0, -20]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02nfkKJAEdyGqNfYOUez1Q" type="4001" source="_02La06JAEdyGqNfYOUez1Q" target="_02Lay6JAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02nflKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nflaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02nflqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nfl6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02nfkaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02nfkqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_utlokAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02nfk6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02nfmKJAEdyGqNfYOUez1Q" type="4001" source="_02Lay6JAEdyGqNfYOUez1Q" target="_02Laz6JAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02nfnKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nfnaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02nfnqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nfn6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02nfmaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02nfmqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_vQTUEAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02nfm6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_02nfoKJAEdyGqNfYOUez1Q" type="4001" source="_02Laz6JAEdyGqNfYOUez1Q" target="_02LaxaJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_02nfpKJAEdyGqNfYOUez1Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nfpaJAEdyGqNfYOUez1Q" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_02nfpqJAEdyGqNfYOUez1Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_02nfp6JAEdyGqNfYOUez1Q" y="60"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_02nfoaJAEdyGqNfYOUez1Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_02nfoqJAEdyGqNfYOUez1Q"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_wIVvUAkxEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_02nfo6JAEdyGqNfYOUez1Q" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_go4bIKTWEdy7eaLHH7_7yw" type="4001" source="_02LaxaJAEdyGqNfYOUez1Q" target="_02LayKJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_go4bJKTWEdy7eaLHH7_7yw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_go4bJaTWEdy7eaLHH7_7yw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_go4bJqTWEdy7eaLHH7_7yw" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_go4bJ6TWEdy7eaLHH7_7yw" y="60"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_go4bKKTWEdy7eaLHH7_7yw" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_go4bKaTWEdy7eaLHH7_7yw" x="1" y="-68"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_go4bIaTWEdy7eaLHH7_7yw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_go4bIqTWEdy7eaLHH7_7yw"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_govRMKTWEdy7eaLHH7_7yw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_go4bI6TWEdy7eaLHH7_7yw" points="[0, -2, -6, 34]$[-6, -34, -12, 2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_go4bKqTWEdy7eaLHH7_7yw" id="(0.475,0.05)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_haNKYaTWEdy7eaLHH7_7yw" type="4001" source="_02LaxaJAEdyGqNfYOUez1Q" target="_02LauaJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_haNKZaTWEdy7eaLHH7_7yw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_haNKZqTWEdy7eaLHH7_7yw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_haNKZ6TWEdy7eaLHH7_7yw" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_haNKaKTWEdy7eaLHH7_7yw" y="60"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_haNKaaTWEdy7eaLHH7_7yw" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_haNKaqTWEdy7eaLHH7_7yw" x="-10" y="23"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_haNKYqTWEdy7eaLHH7_7yw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_haNKY6TWEdy7eaLHH7_7yw"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_haNKYKTWEdy7eaLHH7_7yw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_haNKZKTWEdy7eaLHH7_7yw" points="[5, 4, -94, 0]$[99, 4, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_haNKa6TWEdy7eaLHH7_7yw" id="(0.875,0.4)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_haW7YKTWEdy7eaLHH7_7yw" id="(0.0,0.4)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_iFRgoaTWEdy7eaLHH7_7yw" type="4001" source="_02LaxaJAEdyGqNfYOUez1Q" target="_02LawaJAEdyGqNfYOUez1Q">
- <children xmi:type="notation:Node" xmi:id="_iFRgpaTWEdy7eaLHH7_7yw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_iFRgpqTWEdy7eaLHH7_7yw" y="40"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_iFRgp6TWEdy7eaLHH7_7yw" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_iFRgqKTWEdy7eaLHH7_7yw" y="60"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_iFRgqaTWEdy7eaLHH7_7yw" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_iFRgqqTWEdy7eaLHH7_7yw" x="19" y="17"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_iFRgoqTWEdy7eaLHH7_7yw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_iFRgo6TWEdy7eaLHH7_7yw"/>
- <element xmi:type="uml:ControlFlow" href="12.49.Activity final example.uml#_iFRgoKTWEdy7eaLHH7_7yw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_iFRgpKTWEdy7eaLHH7_7yw" points="[0, 20, -115, -66]$[0, 78, -115, -8]$[106, 78, -9, -8]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_iFRgq6TWEdy7eaLHH7_7yw" id="(0.08035714,0.68)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/UITests.java b/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/UITests.java
index f2d8b83..63c601a 100644
--- a/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/UITests.java
+++ b/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/UITests.java
@@ -25,6 +25,8 @@
import org.eclipse.uml2.diagram.clazz.tests.tool.PalettePackageNodeTest;
import org.eclipse.uml2.diagram.clazz.tests.tool.PalettePrimitiveTypeNodeTest;
import org.eclipse.uml2.diagram.clazz.tests.tool.PalettePropertyNodeTest;
+import org.eclipse.uml2.diagram.clazz.tests.tool.PortProvidedCreationTest;
+import org.eclipse.uml2.diagram.clazz.tests.tool.PortRequiredCreationTest;
import org.eclipse.uml2.diagram.clazz.tests.wholediagram.TestWholeDiagramSuite;
public class UITests {
@@ -43,6 +45,8 @@
suite.addTestSuite(PalettePackageNodeTest.class);
suite.addTestSuite(PalettePrimitiveTypeNodeTest.class);
suite.addTestSuite(PalettePropertyNodeTest.class);
+ suite.addTestSuite(PortProvidedCreationTest.class);
+ suite.addTestSuite(PortRequiredCreationTest.class);
//$JUnit-END$
return suite;
}
diff --git a/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/tool/GeneralizationSetCreationToolTest.java b/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/tool/GeneralizationSetCreationToolTest.java
index c519457..6636b9a 100644
--- a/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/tool/GeneralizationSetCreationToolTest.java
+++ b/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/tool/GeneralizationSetCreationToolTest.java
@@ -38,7 +38,6 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- super.setUp();
DiagramEditPart diagram = getDiagramEditPart();
createNodeByTool(UMLElementTypes.PrimitiveType_2005, 10, 200);
diff --git a/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/tool/PortProvidedCreationTest.java b/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/tool/PortProvidedCreationTest.java
new file mode 100644
index 0000000..03f3efe
--- /dev/null
+++ b/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/tool/PortProvidedCreationTest.java
@@ -0,0 +1,250 @@
+package org.eclipse.uml2.diagram.clazz.tests.tool;
+
+import java.util.Collections;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.Tool;
+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.tools.ConnectionCreationTool;
+import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeConnectionTool;
+import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.uml2.diagram.clazz.edit.parts.Class2EditPart;
+import org.eclipse.uml2.diagram.clazz.edit.parts.InterfaceEditPart;
+import org.eclipse.uml2.diagram.clazz.edit.parts.PortEditPart;
+import org.eclipse.uml2.diagram.clazz.edit.parts.PortProvidedEditPart;
+import org.eclipse.uml2.diagram.clazz.part.UMLVisualIDRegistry;
+import org.eclipse.uml2.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.UMLPackage;
+
+public class PortProvidedCreationTest extends ClassDiagramCreationToolTest {
+
+ public PortProvidedCreationTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ public void testLinkCreation() {
+ IGraphicalEditPart sourceEP = createPortOnClass(createClass());
+ IGraphicalEditPart targetEP = createInterface();
+ ConnectionEditPart portProvidedEP = createPortProvided(sourceEP, targetEP);
+ checkProvidedInterfaceInModel(portProvidedEP);
+ }
+
+ public void testLinkCreationForPortWithType() throws Exception {
+ IGraphicalEditPart source1EP = createPortOnClass(createClass());
+ createNodeByTool(UMLElementTypes.Class_2001, 150, 200); // create Type
+ UMLDiagramFacade.flushEventQueue();
+ setType(source1EP, getSelectedEP());
+
+ IGraphicalEditPart targetEP = createInterface();
+
+ ConnectionEditPart portProvidedEP = createPortProvided(source1EP, targetEP);
+ checkProvidedInterfaceInModel(portProvidedEP);
+ }
+
+ public void testReorientSourceFromPortPortWithoutTypeToPortWithoutType() {
+ IGraphicalEditPart sourceEP = createPortOnClass(createClass());
+ IGraphicalEditPart targetEP = createInterface();
+ ConnectionEditPart portProvidedEP = createPortProvided(sourceEP, targetEP);
+
+ //create target interface
+ createPortOnClass(createClass());
+ IGraphicalEditPart newSourceEP = getSelectedEP();
+ assertNotNull(newSourceEP);
+ assertNotSame(sourceEP, newSourceEP);
+ reorientReferenceConnectionSource(portProvidedEP, newSourceEP);
+
+ UMLDiagramFacade.flushEventQueue();
+ createInterface();// run element creation it to refresh the diagram
+
+ ConnectionEditPart newConnection = findConnection(getDiagramEditPart(), PortProvidedEditPart.VISUAL_ID);
+ assertNotNull(newConnection);
+ assertEquals(newSourceEP.getNotationView().getElement(), getConnectionSource(newConnection));
+ checkProvidedInterfaceInModel(newConnection);
+ }
+
+ public void testReorientSourceFromPortPortWithoutTypeToPortWithType() throws Exception {
+ IGraphicalEditPart sourceEP = createPortOnClass(createClass());
+ IGraphicalEditPart targetEP = createInterface();
+ ConnectionEditPart portProvidedEP = createPortProvided(sourceEP, targetEP);
+
+ //create target interface
+ createPortOnClass(createClass());
+ IGraphicalEditPart newSourceEP = getSelectedEP();
+ setType(newSourceEP, createClass());
+ assertNotNull(newSourceEP);
+ assertNotNull(((Port)newSourceEP.getNotationView().getElement()).getType());
+ assertNotSame(sourceEP, newSourceEP);
+
+ reorientReferenceConnectionSource(portProvidedEP, newSourceEP);
+
+ UMLDiagramFacade.flushEventQueue();
+ createInterface();// run element creation it to refresh the diagram
+
+ ConnectionEditPart newConnection = findConnection(getDiagramEditPart(), PortProvidedEditPart.VISUAL_ID);
+ assertNotNull(newConnection);
+ assertEquals(newSourceEP.getNotationView().getElement(), getConnectionSource(newConnection));
+ checkProvidedInterfaceInModel(newConnection);
+ }
+
+ public void testReorientSourceFromPortPortWithTypeToPortWithType() throws Exception {
+ IGraphicalEditPart sourceEP = createPortOnClass(createClass());
+ setType(sourceEP, createClass());
+
+ IGraphicalEditPart targetEP = createInterface();
+ ConnectionEditPart portProvidedEP = createPortProvided(sourceEP, targetEP);
+
+ //create target interface
+ createPortOnClass(createClass());
+ IGraphicalEditPart newSourceEP = getSelectedEP();
+ setType(newSourceEP, createClass());
+ assertNotNull(newSourceEP);
+ assertNotNull(((Port)newSourceEP.getNotationView().getElement()).getType());
+ assertNotSame(sourceEP, newSourceEP);
+
+ reorientReferenceConnectionSource(portProvidedEP, newSourceEP);
+
+ UMLDiagramFacade.flushEventQueue();
+ createInterface();// run element creation it to refresh the diagram
+
+ ConnectionEditPart newConnection = findConnection(getDiagramEditPart(), PortProvidedEditPart.VISUAL_ID);
+ assertNotNull(newConnection);
+ assertEquals(newSourceEP.getNotationView().getElement(), getConnectionSource(newConnection));
+ checkProvidedInterfaceInModel(newConnection);
+ }
+
+ public void testReorientSourceFromPortPortWithTypeToPortWithoutType() throws Exception {
+ IGraphicalEditPart sourceEP = createPortOnClass(createClass());
+ setType(sourceEP, createClass());
+
+ IGraphicalEditPart targetEP = createInterface();
+ ConnectionEditPart portProvidedEP = createPortProvided(sourceEP, targetEP);
+
+ //create target interface
+ createPortOnClass(createClass());
+ IGraphicalEditPart newSourceEP = getSelectedEP();
+ assertNotNull(newSourceEP);
+ assertNotSame(sourceEP, newSourceEP);
+
+ reorientReferenceConnectionSource(portProvidedEP, newSourceEP);
+
+ UMLDiagramFacade.flushEventQueue();
+ createInterface();// run element creation it to refresh the diagram
+
+ ConnectionEditPart newConnection = findConnection(getDiagramEditPart(), PortProvidedEditPart.VISUAL_ID);
+ assertNotNull(newConnection);
+ assertEquals(newSourceEP.getNotationView().getElement(), getConnectionSource(newConnection));
+ checkProvidedInterfaceInModel(newConnection);
+ }
+
+ public void testReorientTargetForPortWithoutType() {
+ IGraphicalEditPart sourceEP = createPortOnClass(createClass());
+ IGraphicalEditPart targetEP = createInterface();
+ ConnectionEditPart portProvidedEP = createPortProvided(sourceEP, targetEP);
+
+ //create source port
+ createInterface();
+ IGraphicalEditPart newTargetEP = getSelectedEP();
+ assertNotNull(newTargetEP);
+ assertNotSame(targetEP, newTargetEP);
+ reorientReferenceConnectionTarget(portProvidedEP, newTargetEP);
+
+ UMLDiagramFacade.flushEventQueue();
+ createInterface();// run element creation it to refresh the diagram
+
+ ConnectionEditPart newConnection = findConnection(getDiagramEditPart(), PortProvidedEditPart.VISUAL_ID);
+ assertNotNull(newConnection);
+ assertEquals(newTargetEP.getNotationView().getElement(), getConnectionTarget(newConnection));
+ checkProvidedInterfaceInModel(newConnection);
+ }
+
+ public void testReorientTargetForPortWithType() throws Exception {
+ IGraphicalEditPart sourceEP = createPortOnClass(createClass());
+
+ setType(sourceEP, createClass());
+
+ IGraphicalEditPart targetEP = createInterface();
+
+ ConnectionEditPart portProvidedEP = createPortProvided(sourceEP, targetEP);
+
+ createInterface();
+
+ IGraphicalEditPart newTargetEP = (IGraphicalEditPart) ((IStructuredSelection) getSelection()).getFirstElement();
+ assertNotNull(newTargetEP);
+ assertNotSame(targetEP, newTargetEP);
+ reorientReferenceConnectionTarget(portProvidedEP, newTargetEP);
+
+ UMLDiagramFacade.flushEventQueue();
+ createInterface();// run element creation it to refresh the diagram
+
+ ConnectionEditPart newConnection = findConnection(getDiagramEditPart(), PortProvidedEditPart.VISUAL_ID);
+ assertNotNull(newConnection);
+ assertEquals(newTargetEP.getNotationView().getElement(), getConnectionTarget(newConnection));
+ checkProvidedInterfaceInModel(newConnection);
+ }
+
+ private void checkProvidedInterfaceInModel(ConnectionEditPart connectionEP) {
+ EObject source = getConnectionSource(connectionEP);
+ assertTrue(source instanceof Port);
+ EObject target = getConnectionTarget(connectionEP);
+ assertTrue(target instanceof Interface);
+ assertTrue(((Port) source).getProvideds().contains(target));
+ }
+
+ private void setType(IGraphicalEditPart sourceEP, IGraphicalEditPart typeEP) throws Exception {
+ new SetValueCommand(new SetRequest(sourceEP.getNotationView().getElement(), UMLPackage.eINSTANCE.getTypedElement_Type(), (Type) typeEP.getNotationView().getElement())).execute(null, null);
+ }
+
+ private ConnectionEditPart createPortProvided(IGraphicalEditPart source, IGraphicalEditPart target) {
+ ConnectionCreationTool portProvidedTool = new UnspecifiedTypeConnectionTool(Collections.singletonList(UMLElementTypes.PortProvided_4017));
+ createConnectionByTool(portProvidedTool, source, target);
+ UMLDiagramFacade.flushEventQueue();
+ ConnectionEditPart portProvidedEP = findConnection(getDiagramEditPart(), PortProvidedEditPart.VISUAL_ID);
+ assertNotNull("PortProvidedEditPart was not created.", portProvidedEP);
+ return portProvidedEP;
+ }
+
+ private IGraphicalEditPart createInterface() {
+ Point p = getDiagramEditPart().getChildrenBounds().getCopy().expand(10, 0).getBottomRight();
+ Tool classTool = new UnspecifiedTypeCreationTool(Collections.singletonList(UMLElementTypes.Interface_2010));
+ createNodeByTool(classTool, p);
+ IGraphicalEditPart interfaceEP = getSelectedEP();
+ UMLDiagramFacade.flushEventQueue();
+ assertNotNull(interfaceEP);
+ return interfaceEP;
+ }
+
+ private IGraphicalEditPart createClass() {
+ Point p = getDiagramEditPart().getChildrenBounds().getCopy().expand(2, 2).getBottomRight();
+ Tool classTool = new UnspecifiedTypeCreationTool(Collections.singletonList(UMLElementTypes.Class_2001));
+ createNodeByTool(classTool, p);
+ IGraphicalEditPart classEP = getSelectedEP();
+ UMLDiagramFacade.flushEventQueue();
+ assertNotNull(classEP);
+ return classEP;
+ }
+
+ private IGraphicalEditPart createPortOnClass(IGraphicalEditPart classEP) {
+ Tool portTool = new UnspecifiedTypeCreationTool(Collections.singletonList(UMLElementTypes.Port_3025));
+ createNodeByTool(portTool, classEP.getFigure().getBounds().getCopy().getTopLeft());
+ IGraphicalEditPart portEP = classEP.getChildBySemanticHint(UMLVisualIDRegistry.getType(PortEditPart.VISUAL_ID));
+ assertNotNull(portEP);
+ UMLDiagramFacade.flushEventQueue();
+ return portEP;
+
+ }
+
+}
diff --git a/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/tool/PortRequiredCreationTest.java b/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/tool/PortRequiredCreationTest.java
new file mode 100644
index 0000000..47f5d98
--- /dev/null
+++ b/tests/org.eclipse.uml2.diagram.clazz.tests/src/org/eclipse/uml2/diagram/clazz/tests/tool/PortRequiredCreationTest.java
@@ -0,0 +1,151 @@
+package org.eclipse.uml2.diagram.clazz.tests.tool;
+
+import java.util.Collections;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.gef.Tool;
+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.tools.ConnectionCreationTool;
+import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeConnectionTool;
+import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
+import org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand;
+import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.uml2.diagram.clazz.edit.parts.PortEditPart;
+import org.eclipse.uml2.diagram.clazz.edit.parts.PortRequiredEditPart;
+import org.eclipse.uml2.diagram.clazz.part.UMLVisualIDRegistry;
+import org.eclipse.uml2.diagram.clazz.providers.UMLElementTypes;
+import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
+import org.eclipse.uml2.uml.Interface;
+import org.eclipse.uml2.uml.Port;
+import org.eclipse.uml2.uml.Type;
+import org.eclipse.uml2.uml.UMLPackage;
+
+public class PortRequiredCreationTest extends ClassDiagramCreationToolTest {
+
+ public PortRequiredCreationTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ public void testLinkCreation() throws Exception {
+ IGraphicalEditPart source1EP = createPortOnClass(createClass());
+ createNodeByTool(UMLElementTypes.Class_2001, 150, 200); // create Type
+ UMLDiagramFacade.flushEventQueue();
+ setType(source1EP, getSelectedEP());
+
+ IGraphicalEditPart targetEP = createInterface();
+
+ ConnectionEditPart portLinkEP = createPortRequired(source1EP, targetEP);
+ checkRequiredInterfaceInModel(portLinkEP);
+ }
+
+ public void testReorientSource() throws Exception {
+ IGraphicalEditPart sourceEP = createPortOnClass(createClass());
+ setType(sourceEP, createClass());
+
+ IGraphicalEditPart targetEP = createInterface();
+ ConnectionEditPart portRequiredEP = createPortRequired(sourceEP, targetEP);
+
+ //create target interface
+ createPortOnClass(createClass());
+ IGraphicalEditPart newSourceEP = getSelectedEP();
+ setType(newSourceEP, createClass());
+ assertNotNull(newSourceEP);
+ assertNotNull(((Port)newSourceEP.getNotationView().getElement()).getType());
+ assertNotSame(sourceEP, newSourceEP);
+
+ reorientReferenceConnectionSource(portRequiredEP, newSourceEP);
+
+ UMLDiagramFacade.flushEventQueue();
+ createInterface();// run element creation it to refresh the diagram
+
+ ConnectionEditPart newConnection = findConnection(getDiagramEditPart(), PortRequiredEditPart.VISUAL_ID);
+ assertNotNull(newConnection);
+ assertEquals(newSourceEP.getNotationView().getElement(), getConnectionSource(newConnection));
+ checkRequiredInterfaceInModel(newConnection);
+ }
+
+ public void testReorientTarget() throws Exception {
+ IGraphicalEditPart sourceEP = createPortOnClass(createClass());
+
+ setType(sourceEP, createClass());
+
+ IGraphicalEditPart targetEP = createInterface();
+
+ ConnectionEditPart portLinkEP = createPortRequired(sourceEP, targetEP);
+
+ createInterface();
+
+ IGraphicalEditPart newTargetEP = (IGraphicalEditPart) ((IStructuredSelection) getSelection()).getFirstElement();
+ assertNotNull(newTargetEP);
+ assertNotSame(targetEP, newTargetEP);
+ reorientReferenceConnectionTarget(portLinkEP, newTargetEP);
+
+ UMLDiagramFacade.flushEventQueue();
+ createInterface();// run element creation it to refresh the diagram
+
+ ConnectionEditPart newConnection = findConnection(getDiagramEditPart(), PortRequiredEditPart.VISUAL_ID);
+ assertNotNull(newConnection);
+ assertEquals(newTargetEP.getNotationView().getElement(), getConnectionTarget(newConnection));
+ checkRequiredInterfaceInModel(newConnection);
+ }
+
+ private void checkRequiredInterfaceInModel(ConnectionEditPart connectionEP) {
+ EObject source = getConnectionSource(connectionEP);
+ assertTrue(source instanceof Port);
+ EObject target = getConnectionTarget(connectionEP);
+ assertTrue(target instanceof Interface);
+ assertTrue(((Port) source).getRequireds().contains(target));
+ }
+
+ private void setType(IGraphicalEditPart sourceEP, IGraphicalEditPart typeEP) throws Exception {
+ new SetValueCommand(new SetRequest(sourceEP.getNotationView().getElement(), UMLPackage.eINSTANCE.getTypedElement_Type(), (Type) typeEP.getNotationView().getElement())).execute(null, null);
+ }
+
+ private ConnectionEditPart createPortRequired(IGraphicalEditPart source, IGraphicalEditPart target) {
+ ConnectionCreationTool portRequiredTool = new UnspecifiedTypeConnectionTool(Collections.singletonList(UMLElementTypes.PortRequired_4018));
+ createConnectionByTool(portRequiredTool, source, target);
+ UMLDiagramFacade.flushEventQueue();
+ ConnectionEditPart portRequiredEP = findConnection(getDiagramEditPart(), PortRequiredEditPart.VISUAL_ID);
+ assertNotNull("PortRequiredEditPart was not created.", portRequiredEP);
+ return portRequiredEP;
+ }
+
+ private IGraphicalEditPart createInterface() {
+ Point p = getDiagramEditPart().getChildrenBounds().getCopy().expand(10, 0).getBottomRight();
+ Tool classTool = new UnspecifiedTypeCreationTool(Collections.singletonList(UMLElementTypes.Interface_2010));
+ createNodeByTool(classTool, p);
+ IGraphicalEditPart interfaceEP = getSelectedEP();
+ UMLDiagramFacade.flushEventQueue();
+ assertNotNull(interfaceEP);
+ return interfaceEP;
+ }
+
+ private IGraphicalEditPart createClass() {
+ Point p = getDiagramEditPart().getChildrenBounds().getCopy().expand(2, 2).getBottomRight();
+ Tool classTool = new UnspecifiedTypeCreationTool(Collections.singletonList(UMLElementTypes.Class_2001));
+ createNodeByTool(classTool, p);
+ IGraphicalEditPart classEP = getSelectedEP();
+ UMLDiagramFacade.flushEventQueue();
+ assertNotNull(classEP);
+ return classEP;
+ }
+
+ private IGraphicalEditPart createPortOnClass(IGraphicalEditPart classEP) {
+ Tool portTool = new UnspecifiedTypeCreationTool(Collections.singletonList(UMLElementTypes.Port_3025));
+ createNodeByTool(portTool, classEP.getFigure().getBounds().getCopy().getTopLeft());
+ IGraphicalEditPart portEP = classEP.getChildBySemanticHint(UMLVisualIDRegistry.getType(PortEditPart.VISUAL_ID));
+ assertNotNull(portEP);
+ UMLDiagramFacade.flushEventQueue();
+ return portEP;
+
+ }
+
+}
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/.classpath b/tests/org.eclipse.uml2.diagram.common.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/.cvsignore b/tests/org.eclipse.uml2.diagram.common.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/.project b/tests/org.eclipse.uml2.diagram.common.tests/.project
deleted file mode 100644
index 84aae12..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.common.tests</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/tests/org.eclipse.uml2.diagram.common.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.diagram.common.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index f9d3b20..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.common.tests;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.uml2.diagram.common.tests,
- org.eclipse.uml2.diagram.common.tests.palette,
- org.eclipse.uml2.diagram.common.tool,
- org.eclipse.uml2.diagram.common.wholediagram
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.emf.ecore,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.notation,
- org.eclipse.gmf.runtime.common.ui,
- org.junit,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.uml2.uml,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.0.3"
-Bundle-ClassPath: .
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/about.html b/tests/org.eclipse.uml2.diagram.common.tests/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/tests/org.eclipse.uml2.diagram.common.tests/build.properties b/tests/org.eclipse.uml2.diagram.common.tests/build.properties
deleted file mode 100644
index 36f13b8..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-jars.compile.order = .
-output.. = bin/
-source.. = src/
-
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- plugin.xml,\
- .
-
-src.includes = about.html
-
-
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/plugin.properties b/tests/org.eclipse.uml2.diagram.common.tests/plugin.properties
deleted file mode 100644
index 593bd81..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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=UML2 Diagram Testing Environment Plug-in (Incubation)
-providerName=Eclipse.org
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/plugin.xml b/tests/org.eclipse.uml2.diagram.common.tests/plugin.xml
deleted file mode 100644
index 17ce305..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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:
- Tatiana Fesenko (Borland) - initial API and implementation
--->
-
-<plugin>
-</plugin>
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/FakeNonUITest.java b/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/FakeNonUITest.java
deleted file mode 100644
index 5454a1c..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/FakeNonUITest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.eclipse.uml2.diagram.common.tests;
-
-import junit.framework.TestCase;
-
-public class FakeNonUITest extends TestCase {
- public void testNonUITest() throws Exception {
- //all actual tests for StateMachineDiagram require GMF diagram viewer and
- //can not be run in headless mode (see #[194901]).
- //Thus, they are disabled in the Eclipse EMFT build procedure that
- //can run headless tests only
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/UMLDiagramFacade.java b/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/UMLDiagramFacade.java
deleted file mode 100644
index d78d2c0..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/UMLDiagramFacade.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.uml2.diagram.common.tests;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-
-public abstract class UMLDiagramFacade {
-
- protected final String myDiagramFileExtension;
-
- protected abstract Resource createDiagram(URI diagramModelURI, URI domainModelURI);
-
- private Resource myDiagramResource;
-
- private Resource myModelResource;
-
- private IDiagramWorkbenchPart myDiagramWorkbenchPart;
-
- private String myProjectPath;
-
- public UMLDiagramFacade(String projectPath, String diagramFileExtension) {
- myProjectPath = projectPath;
- myDiagramFileExtension = diagramFileExtension;
- }
-
- public void create(String diagramName) {
- URI diagramModelURI = URI.createPlatformResourceURI(new Path(myProjectPath).append(diagramName + "." + myDiagramFileExtension).toOSString(), false); //$NON-NLS-1$
- URI domainModelURI = URI.createPlatformResourceURI(new Path(myProjectPath).append(diagramName + ".uml").toOSString(), false); //$NON-NLS-1$
- myDiagramResource = createDiagram(diagramModelURI, domainModelURI);
- }
-
- public void create() {
- create("test");
- }
-
- public void open() throws PartInitException {
- String path = myDiagramResource.getURI().toPlatformString(true);
- IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));
- if (workspaceResource instanceof IFile) {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
- IEditorPart editorPart = page
- .openEditor(new FileEditorInput((IFile) workspaceResource), workbench.getEditorRegistry().getDefaultEditor(workspaceResource.getFullPath().toString()).getId());
- myDiagramWorkbenchPart = (IDiagramWorkbenchPart) editorPart;
- }
- }
-
- public void close() {
- if (myDiagramWorkbenchPart != null && myDiagramWorkbenchPart instanceof IEditorPart) {
- IWorkbenchPage page = myDiagramWorkbenchPart.getSite().getPage();
- page.closeEditor((IEditorPart) myDiagramWorkbenchPart, false);
- }
- myDiagramWorkbenchPart = null;
- myDiagramResource.unload();
- myDiagramResource = null;
- if (myModelResource != null) {
- myModelResource.unload();
- myModelResource = null;
- }
- }
-
- public IDiagramWorkbenchPart getDiagramWorkbenchPart() {
- return myDiagramWorkbenchPart;
- }
-
- public DiagramEditPart getDiagramEditPart() {
- Assert.assertNotNull(myDiagramWorkbenchPart);
- return myDiagramWorkbenchPart.getDiagramEditPart();
- }
-
- public IDiagramEditDomain getDiagramEditDomain() {
- Assert.assertNotNull(myDiagramWorkbenchPart);
- return myDiagramWorkbenchPart.getDiagramEditDomain();
- }
-
- public static void flushEventQueue() {
- Display display = Display.getDefault();
- while (display.readAndDispatch()) {
- // do nothing
- }
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/UMLProjectFacade.java b/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/UMLProjectFacade.java
deleted file mode 100644
index c6062d1..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/UMLProjectFacade.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.eclipse.uml2.diagram.common.tests;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-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;
-
-public class UMLProjectFacade {
-
- private IProject myProject;
-
- public UMLProjectFacade() throws CoreException {
- this("TestProject");
- }
-
- public UMLProjectFacade(String name) throws CoreException {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceRoot wsroot = workspace.getRoot();
-
- myProject = wsroot.getProject(name);
-
- IProjectDescription desc = workspace.newProjectDescription(myProject.getName());
-
- if (!myProject.exists()) {
- myProject.create(desc, null);
- }
-
- if (!myProject.isOpen()) {
- myProject.open(null);
- }
- }
-
- public IFile getFile(String name) {
- return myProject.getFile(name);
- }
-
- public IFile createEmptyFile(String name) throws CoreException {
- IFile file = getFile(name);
- file.create(new InputStream() {
-
- @Override
- public int read() throws IOException {
- return -1;
- }
- }, true, null);
- return file;
- }
-
- public void close() throws CoreException {
- try {
- myProject.delete(true, true, null);
- } finally {
- myProject = null;
- }
- }
-
- public String getFullPath() {
- return myProject.getFullPath().toString();
-
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/EntryExistenceTest.java b/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/EntryExistenceTest.java
deleted file mode 100644
index 4d3edb1..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/EntryExistenceTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.uml2.diagram.common.tests.palette;
-
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.gef.palette.PaletteRoot;
-
-public class EntryExistenceTest extends PaletteEntriesTestBase {
-
- public EntryExistenceTest(PaletteRoot paletteRoot, int groupIndex, ENamedElement type, int entryIndex) {
- super(paletteRoot, groupIndex, type, entryIndex);
- // TODO Auto-generated constructor stub
- }
-
- @Override
- protected void testEntry() {
- assertTrue(myType.getName() + " Entry is estimated in " + myEntryIndex + " in group " + myPaletteGroup.getId(), myPaletteGroup.getChildren().size() > myEntryIndex);
- }
-
- @Override
- public String getName() {
- return "test" + myType.getName() + "EntryExistence";
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/EntryLabelTest.java b/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/EntryLabelTest.java
deleted file mode 100644
index ee5c384..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/EntryLabelTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.uml2.diagram.common.tests.palette;
-
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-
-public class EntryLabelTest extends PaletteEntriesTestBase {
-
- public EntryLabelTest(PaletteRoot paletteRoot, int groupIndex, ENamedElement type, int entryIndex) {
- super(paletteRoot, groupIndex, type, entryIndex);
- // TODO Auto-generated constructor stub
- }
- @Override
- protected void testEntry() {
- ToolEntry entry = getToolEntryAt(myPaletteGroup, myEntryIndex);
- String name = myType.getName();
- String lowerCaseName = name.toLowerCase();
- StringBuffer label = new StringBuffer();
- label.append(name.charAt(0));
- for (int i = 1; i < name.length(); i++) {
- if (name.charAt(i) != lowerCaseName.charAt(i)) {
- label.append(" ");
- }
- label.append(name.charAt(i));
- }
- assertEquals(label.toString(), entry.getLabel());
- }
- @Override
- public String getName() {
- return "test" + myType.getName() + "EntryLabel";
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/EntryMetaclassTest.java b/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/EntryMetaclassTest.java
deleted file mode 100644
index d87b339..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/EntryMetaclassTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.eclipse.uml2.diagram.common.tests.palette;
-
-import java.lang.reflect.Field;
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.uml2.uml.UMLPackage;
-
-public abstract class EntryMetaclassTest extends PaletteEntriesTestBase {
-
- public EntryMetaclassTest(PaletteRoot paletteRoot, int groupIndex, ENamedElement type, int entryIndex) {
- super(paletteRoot, groupIndex, type, entryIndex);
- }
-
- @Override
- protected void testEntry() {
- ToolEntry entry = getToolEntryAt(myPaletteGroup, myEntryIndex);
- List elementTypes = getElementTypes(entry);
- assertNotNull("Impossible to get 'elementTypes' field value.", elementTypes);
- for (Object object : elementTypes) {
- IAdaptable hint = (IAdaptable) object;
- ENamedElement element = getElement(hint);
- assertEquals("Incorrect metaclass in entry " + myEntryIndex + " in " + myPaletteGroup.getId() + " group.", myType, element);
- }
- }
-
- @Override
- public String getName() {
- return "test" + myType.getName() + "MetaclassEntry";
- }
-
- private boolean isRelationship(ENamedElement type) {
- return type instanceof EClass && ((EClass) type).getEAllSuperTypes().contains(UMLPackage.eINSTANCE.getRelationship());
- }
-
- private List getElementTypes(ToolEntry tool) {
- boolean isRelationship = isRelationship(myType);
- String field = (isRelationship) ? FIELD_RELATIONSHIP : FIELD_NODE;
- Field elementTypeField;
- try {
- elementTypeField = tool.getClass().getDeclaredField(field);
- if (!elementTypeField.isAccessible()) {
- elementTypeField.setAccessible(true);
- }
- List elementTypes = (List) elementTypeField.get(tool);
- return elementTypes;
- } catch (SecurityException e) {
- // TODO Auto-generated catch block
- fail("Cannot get element types: SecurityException");
- } catch (NoSuchFieldException e) {
- fail("Cannot get element types: NoSuchFieldException");
- } catch (IllegalArgumentException e) {
- fail("Cannot get element types: IllegalArgumentException");
- } catch (IllegalAccessException e) {
- fail("Cannot get element types: IllegalAccessException");
- }
- return null;
- }
-
- protected abstract ENamedElement getElement(IAdaptable hint);
-
- private static final String FIELD_RELATIONSHIP = "relationshipTypes";
-
- private static final String FIELD_NODE = "elementTypes";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/PaletteEntriesTestBase.java b/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/PaletteEntriesTestBase.java
deleted file mode 100644
index 43ff77b..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tests/palette/PaletteEntriesTestBase.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.eclipse.uml2.diagram.common.tests.palette;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-
-public abstract class PaletteEntriesTestBase extends TestCase {
- protected PaletteContainer myPaletteGroup;
- protected int myGroupIndex;
- protected ENamedElement myType;
- protected int myEntryIndex;
-
- public PaletteEntriesTestBase(PaletteRoot paletteRoot, int groupIndex, ENamedElement type, int entryIndex) {
- myGroupIndex = groupIndex;
- myType = type;
- myEntryIndex = entryIndex;
- List groups = paletteRoot.getChildren();
- myPaletteGroup = (PaletteContainer) groups.get(myGroupIndex);
-
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
- @Override
- protected void runTest() throws Throwable {
- testEntry();
- }
-
- protected ToolEntry getToolEntryAt(PaletteContainer group, int index) {
- return (ToolEntry)group.getChildren().get(index);
- }
-
- protected abstract void testEntry();
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tool/CreationToolTestBase.java b/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tool/CreationToolTestBase.java
deleted file mode 100644
index d588b91..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/tool/CreationToolTestBase.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.eclipse.uml2.diagram.common.tool;
-
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.Tool;
-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.tools.ConnectionCreationTool;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.internal.intro.IIntroConstants;
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.common.tests.UMLProjectFacade;
-
-public abstract class CreationToolTestBase extends TestCase {
-
- private UMLDiagramFacade myDiagramFacade;
-
- private UMLProjectFacade myProject;
-
- protected EditDomain myEditDomain;
-
- protected org.eclipse.gef.EditPartViewer myDiagramViewer;
-
- private DiagramEditPart myDiagramEditPart;
-
- public CreationToolTestBase(String name) {
- super(name);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- skipIntro();
- myProject = new UMLProjectFacade();
- myDiagramFacade = getDiagram(myProject.getFullPath());
- myDiagramFacade.create(getName());
- myDiagramFacade.open();
- myEditDomain = (EditDomain) myDiagramFacade.getDiagramEditDomain();
- myDiagramEditPart = myDiagramFacade.getDiagramEditPart();
- myDiagramViewer = myDiagramEditPart.getViewer();
- }
-
- @Override
- protected void tearDown() throws Exception {
- myDiagramFacade.close();
- myDiagramFacade = null;
- myDiagramEditPart = null;
- myEditDomain = null;
- myDiagramViewer = null;
- try {
- myProject.close();
- } catch (Exception e) {
- e.printStackTrace();
- }
- myProject = null;
- super.tearDown();
- }
-
- protected DiagramEditPart getDiagramEditPart() {
- return myDiagramEditPart;
- }
-
- protected IWorkbenchPage getWorkbenchPage() {
- return myDiagramFacade.getDiagramWorkbenchPart().getSite().getPage();
- }
-
- protected ISelection getSelection() {
- return getDiagramEditPart().getViewer().getSelection();
- }
-
- protected abstract UMLDiagramFacade getDiagram(String projectPath);
-
- protected void createConnectionByToolDoubleClick(ConnectionCreationTool tool) {
- tool.setEditDomain(myEditDomain);
- tool.activate();
- tool.mouseDoubleClick(createMouseEvent(0, 0), myDiagramViewer);
- tool.deactivate();
- }
-
- protected void createConnectionByTool(ConnectionCreationTool tool, IGraphicalEditPart sourceEditPart, IGraphicalEditPart targetEditPart) {
- Point source = sourceEditPart.getFigure().getBounds().getTopLeft();
- Point target = targetEditPart.getFigure().getBounds().getTopLeft();
- createConnectionByTool(tool, source.x, source.y, target.x, target.y);
- }
-
- protected void createConnectionByTool(ConnectionCreationTool tool, int x1, int y1, int x2, int y2) {
- tool.setEditDomain(myEditDomain);
- tool.activate();
- tool.mouseMove(createMouseEvent(x1, y1), myDiagramViewer);
- tool.mouseDown(createMouseEvent(x1, y1), myDiagramViewer);
- tool.mouseDrag(createMouseEvent(x2, y2), myDiagramViewer);
- tool.mouseUp(createMouseEvent(x2, y2), myDiagramViewer);
- tool.deactivate();
- }
-
- protected void createNodeByTool(IElementType elementType) {
- createNodeByTool(elementType, 70, 70);
- }
-
- protected void createNodeByTool(Tool tool, int x, int y) {
- tool.setEditDomain(myEditDomain);
- tool.activate();
- tool.mouseMove(createMouseEvent(x, y), myDiagramViewer);
- tool.mouseDown(createMouseEvent(x, y), myDiagramViewer);
- tool.mouseUp(createMouseEvent(x, y), myDiagramViewer);
- tool.deactivate();
- }
-
- protected void createNodeByTool(IElementType elementType, int x, int y) {
- UnspecifiedTypeCreationTool tool = new UnspecifiedTypeCreationTool(Collections.singletonList(elementType));
- createNodeByTool(tool, x, y);
- }
-
- protected void createNodeByTool(IElementType elementType, Point p) {
- createNodeByTool(elementType, p.x, p.y);
- }
-
- protected void createNodeByTool(Tool tool, Point p) {
- createNodeByTool(tool, p.x, p.y);
- }
-
- private MouseEvent createMouseEvent(int x, int y) {
- Event e = new Event();
-
- e.widget = myDiagramViewer.getControl();
- e.display = e.widget.getDisplay();
- e.button = 1; // left button
- e.x = x;
- e.y = y;
-
- return new MouseEvent(e);
- }
-
- private static void skipIntro() {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- IViewReference reference = page.findViewReference(IIntroConstants.INTRO_VIEW_ID);
- if (reference != null) {
- page.hideView(reference.getView(false));
- }
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/wholediagram/TestWholeDiagram.java b/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/wholediagram/TestWholeDiagram.java
deleted file mode 100644
index ed4b9a3..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/wholediagram/TestWholeDiagram.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package org.eclipse.uml2.diagram.common.wholediagram;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-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.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.Edge;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.common.util.UML2Util.EStructuralFeatureMatcher;
-import org.eclipse.uml2.diagram.common.tests.UMLProjectFacade;
-import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.UMLPackage;
-
-public abstract class TestWholeDiagram extends TestCase {
-
- protected abstract UMLInitDiagramFacade getInitDiagramFacade(IFile modelFile, IFile diagramFile);
-
- protected abstract URL findFileInTestPlugin(String fileName);
-
- private String myModelFileName;
-
- private String myDiagramFileName;
-
- private UMLInitDiagramFacade myInitDiagramFacade;
-
- public TestWholeDiagram(String modelFileName, String diagramFileName) {
- myModelFileName = modelFileName;
- myDiagramFileName = diagramFileName;
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- myInitDiagramFacade.close();
- myInitDiagramFacade = null;
- myModelFileName = null;
- myDiagramFileName = null;
- }
-
- @Override
- protected void runTest() throws Throwable {
- testSample();
- }
-
- /*
- * A name of test. It used, e.g. by JUnit perspective, to display test result.
- */
- @Override
- public String getName() {
- return "test_" + myModelFileName;
- }
-
- public void testSample() throws Exception {
- URL diagramURL = findFileInTestPlugin(myDiagramFileName);
- URL modelURL = findFileInTestPlugin(myModelFileName);
- assertNotNull("Cannot find diagram file " + myDiagramFileName + ".", diagramURL);
- assertNotNull("Cannot find model file " + myModelFileName + ".", modelURL);
-
- UMLProjectFacade project = null;
- try {
- project = new UMLProjectFacade();
- } catch (CoreException e1) {
- fail("Cannot create project.");
- }
- IFile templateFile = project.getFile(myDiagramFileName);
- IFile modelFile = project.getFile(myModelFileName);
- templateFile.create(diagramURL.openStream(), true, null);
- modelFile.create(modelURL.openStream(), true, null);
- Diagram view1 = getDiagramRoot(templateFile);
- myInitDiagramFacade = getInitDiagramFacade(modelFile, project.createEmptyFile("restored" + myDiagramFileName));
- Diagram view2 = myInitDiagramFacade.getDiagramView();
- compareDiagrams(view1, view2);
- }
-
- private Diagram getDiagramRoot(IFile file) {
- TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain();
- ResourceSet resourceSet = editingDomain.getResourceSet();
- org.eclipse.emf.common.util.URI diagramModelURI = org.eclipse.emf.common.util.URI.createPlatformResourceURI(file.getFullPath().toString(), true);
- Resource diagramResource = resourceSet.getResource(diagramModelURI, true);
- return (Diagram) diagramResource.getContents().get(0);
- }
-
- protected void compareDiagrams(Diagram diagram1, Diagram diagram2) {
- compareChildren(diagram1, diagram2);
- compareEdges(diagram1, diagram2);
- }
-
- private void compareViews(View view1, View view2) {
- System.out.println("TestWholeDiagram.compareViews(); View1 " + view1);
- System.out.println("TestWholeDiagram.compareViews(); View2 " + view2);
- assertEquals("Incorrect View type " + getStackTrace(view2) + " for element " + view2.getElement(), view1.getType(), view2.getType());
- assertEquals("Incorrect Element eClass " + getStackTrace(view2), view1.getElement().eClass(), view2.getElement().eClass());
- assertEquals("Incorrect View eClass " + getStackTrace(view2), view1.eClass(), view2.eClass());
- }
-
- private void compareEdges(Diagram diagram1, Diagram diagram2) {
- EList edges1 = diagram1.getEdges();
- EList edges2 = diagram2.getEdges();
- assertEquals("Diagram has incorrect edges size. Expected: " + getPringString(edges1) + ", was: " + getPringString(edges2), edges1.size(), edges2.size());
- for (int i = 0; i < edges1.size(); i++) {
- Edge edge1 = (Edge) edges1.get(i);
- Edge edge2 = (Edge) findTwinForEdge(edge1, edges2);
- if (edge2 == null) {
- Assert.fail("View for " + getPringString(edge1) + " was not found in the initialized diagram");
- }
- assertEquals("Incorrect Edge type: ", edge1.getType(), edge2.getType());
- assertEquals("Incorrect Edge source type: edge = " + edge2.getElement(), edge1.getSource().getType(), edge2.getSource().getType());
- assertEquals("Incorrect Edge source element eClass: edge = " + edge2.getElement(), edge1.getSource().getElement().eClass(), edge2.getSource().getElement().eClass());
- assertEquals("Incorrect Edge target type: edge = " + edge2.getElement(), edge1.getTarget().getType(), edge2.getTarget().getType());
- assertEquals("Incorrect Edge target element eClass: edge = " + edge2.getElement(), edge1.getTarget().getElement().eClass(), edge2.getTarget().getElement().eClass());
- }
- }
-
- private void compareChildren(View expected, View actual) {
- compareViews(expected, actual);
-
- List<View> expectedChildren = getFilteredChildren(expected);
- List<View> actualChildren = getFilteredChildren(actual);
- Map<String, List<View>> actualType2View = mapTypesToViews(actualChildren);
- for (View next: expectedChildren) {
- List<View> alikeViews = actualType2View.get(next.getType());
- if (alikeViews == null) {
- Assert.fail("View for " + getPringString(next) + " was not found in the initialized diagram");
- }
- View twin = findTwin(next, alikeViews);
- if (twin == null) {
- Assert.fail("View for " + getPringString(next) + " was not found in the initialized diagram");
- }
- compareChildren(next, twin);
- alikeViews.remove(twin);
- }
- List<View> rest = new ArrayList<View>();
- for (String key: actualType2View.keySet()) {
- rest.addAll(actualType2View.get(key));
- }
- if (!rest.isEmpty()) {
- fail("The following view are not expected, but they exist: " + getPringString(rest));
- }
- }
-
-/*
- * find an element with the same name as a given element has
- */
- private View findTwin(View element, List<View> alikeViews) {
- if (false == element.getElement() instanceof NamedElement) {
- return alikeViews.isEmpty() ? null : alikeViews.get(0);
- }
- for (View next: alikeViews) {
- if (new ViewMatcher(element).matches(next)) {
- return next;
- }
- }
- return null;
- }
-
- private View findTwinForEdge(Edge element, List<View> alikeViews) {
- if (false == element.getElement() instanceof NamedElement) {
- return alikeViews.isEmpty() ? null : alikeViews.get(0);
- }
- for (View next: alikeViews) {
- if (new EdgeMatcher(element).matches(next)) {
- return next;
- }
- }
- return null;
- }
-
- private static class ViewMatcher extends EStructuralFeatureMatcher {
- public ViewMatcher(View view) {
- super(view.getElement(), UMLPackage.Literals.NAMED_ELEMENT__NAME);
- }
- @Override
- public boolean matches(EObject otherEObject) {
- return super.matches(((View)otherEObject).getElement());
- }
- }
-
- private static class EdgeMatcher extends ViewMatcher {
- private Edge myEdge;
- public EdgeMatcher(Edge edge) {
- super(edge);
- myEdge = edge;
- }
-
- @Override
- public boolean matches(EObject otherEObject) {
- if (!super.matches((Edge)otherEObject)) {
- return false;
- }
- Edge otherEdge = (Edge)otherEObject;
- return new ViewMatcher(myEdge.getSource()).matches(otherEdge.getSource()) && new ViewMatcher(myEdge.getTarget()).matches(otherEdge.getTarget());
- }
- }
-
- private StringBuffer getStackTrace(View node) {
- if (node == null) {
- return EMPTY;
- }
- StringBuffer result = new StringBuffer();
- if (node.getElement() instanceof NamedElement) {
- result.append("'").append(((NamedElement) node.getElement()).getName()).append("'").append(", ");
- }
- result.append("vid = ").append(node.getType());
- StringBuffer parentStack = getStackTrace((View) node.eContainer());
- if (parentStack.length() > 0) {
- result.append(" from ").append(parentStack);
- }
- return result;
- }
-
- private static StringBuffer getPringString(List<View> children) {
- StringBuffer result = new StringBuffer();
- for (View child: children ) {
- result.append(getPringString(child)).append("; ");
- }
- return result;
- }
-
- private static StringBuffer getPringString(View node) {
- StringBuffer result = new StringBuffer();
- if (node != null) {
- if (node.getElement() instanceof NamedElement) {
- result.append(((NamedElement) node.getElement()).getName()).append(", ");
- }
- result.append("vid = ").append(node.getType());
- }
- return result;
- }
-
- private List<View> getFilteredChildren(View view) {
- List<View> result = new ArrayList<View>();
- Iterator iter = view.getChildren().iterator();
- while (iter.hasNext()) {
- View next = (View) iter.next();
- int visualId;
- try {
- visualId = Integer.parseInt(next.getType());
- } catch (NumberFormatException e) {
- continue;
- }
-
- if (ignoreView(visualId)) {
- continue;
- }
- result.add(next);
- }
- return result;
- }
-
- private Map<String, List<View>> mapTypesToViews(List<View> views) {
- Map<String, List<View>> result = new HashMap<String, List<View>>();
- for (View view: views) {
- String type = view.getType();
- List<View> list = result.get(type);
- if (list == null) {
- list = new ArrayList<View>();
- result.put(type, list);
- }
- list.add(view);
- }
- return result;
- }
-
- protected boolean ignoreView(int visualId) {
- return 5000< visualId && visualId < 6000;
- }
-
- private static StringBuffer EMPTY = new StringBuffer(0);
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/wholediagram/UMLInitDiagramFacade.java b/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/wholediagram/UMLInitDiagramFacade.java
deleted file mode 100644
index 1f471e4..0000000
--- a/tests/org.eclipse.uml2.diagram.common.tests/src/org/eclipse/uml2/diagram/common/wholediagram/UMLInitDiagramFacade.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.eclipse.uml2.diagram.common.wholediagram;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedList;
-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.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.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-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.resource.ResourceSet;
-import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-
-public abstract class UMLInitDiagramFacade {
-
- protected abstract Diagram createDiagramView(EObject modelRoot);
-
- private Resource myRestoredDiagramResource;
-
- private Resource myModelResource;
-
- private IDiagramWorkbenchPart myDiagramWorkbenchPart;
-
- private IFile myModelFile;
-
- private IFile myDagramFile;
-
- private final String diagram_editor_id;
-
- public UMLInitDiagramFacade(IFile modelFile, IFile diagramFile, String deID) {
- myModelFile = modelFile;
- myDagramFile = diagramFile;
- diagram_editor_id = deID;
- }
-
- public void close() {
- if (myDiagramWorkbenchPart != null && myDiagramWorkbenchPart instanceof IEditorPart) {
- IWorkbenchPage page = myDiagramWorkbenchPart.getSite().getPage();
- page.closeEditor((IEditorPart) myDiagramWorkbenchPart, false);
- }
- myDiagramWorkbenchPart = null;
- myRestoredDiagramResource.unload();
- myRestoredDiagramResource = null;
- if (myModelResource != null) {
- myModelResource.unload();
- myModelResource = null;
- }
- }
-
- public Diagram getDiagramView() throws ExecutionException, IOException, CoreException {
- return initializeDiagramFromDomainModel(myModelFile, myDagramFile);
- }
-
- private Diagram openDiagram(Resource diagram) throws PartInitException {
- String path = diagram.getURI().toPlatformString(true);
- IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));
- if (workspaceResource instanceof IFile) {
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IEditorPart editor = page.openEditor(new FileEditorInput((IFile) workspaceResource), diagram_editor_id);
- return ((DiagramDocumentEditor)editor).getDiagram();
- }
- return null;
- }
-
- public static void refreshDiagram(Diagram diagram) {
- EObject modelElement = diagram.getElement();
- List<?> editPolicies = CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);
- for (Iterator<?> it = editPolicies.iterator(); it.hasNext();) {
- CanonicalEditPolicy nextEditPolicy = (CanonicalEditPolicy) it.next();
- nextEditPolicy.refresh();
- }
-
- }
-
- private Diagram initializeDiagramFromDomainModel(IFile modelFile, IFile diagramFile) throws ExecutionException, IOException, CoreException {
- diagramFile.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$
- TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain();
- ResourceSet resourceSet = editingDomain.getResourceSet();
- final EObject modelRoot = getModelRoot(modelFile, resourceSet);
-
- Diagram diagram = createDiagramView(modelRoot);
-
- myRestoredDiagramResource = createEmptyResource(resourceSet, diagramFile);
- addDiagramToResource(myRestoredDiagramResource, diagram, editingDomain, diagramFile);
- myRestoredDiagramResource.save(Collections.emptyMap());
- return openDiagram(myRestoredDiagramResource);
- }
-
- private void addDiagramToResource(final Resource diagramResource, final Diagram diagram, TransactionalEditingDomain editingDomain, IFile diagramFile) throws ExecutionException {
- List affectedFiles = new LinkedList();
- affectedFiles.add(diagramFile);
- AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, "Initializing diagram contents", affectedFiles) { //$NON-NLS-1$
-
- protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- diagramResource.getContents().add(diagram);
- return CommandResult.newOKCommandResult();
- }
- };
- OperationHistoryFactory.getOperationHistory().execute(command, new NullProgressMonitor(), null);
- }
-
- private Resource createEmptyResource(ResourceSet resourceSet, IFile diagramFile) {
- org.eclipse.emf.common.util.URI diagramModelURI = org.eclipse.emf.common.util.URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true);
- final Resource diagramResource = resourceSet.createResource(diagramModelURI);
- return diagramResource;
- }
-
- private EObject getModelRoot(final IFile modelFile, ResourceSet resourceSet) {
- URI domainModelURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), false);
- myModelResource = resourceSet.getResource(domainModelURI, true);
- EObject modelRoot = (EObject) myModelResource.getContents().get(0);
- return modelRoot;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/.classpath b/tests/org.eclipse.uml2.diagram.component.tests/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/.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/tests/org.eclipse.uml2.diagram.component.tests/.project b/tests/org.eclipse.uml2.diagram.component.tests/.project
deleted file mode 100644
index 62fa20a..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.component.tests</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/tests/org.eclipse.uml2.diagram.component.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.uml2.diagram.component.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9d88644..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Apr 14 19:26:53 CEST 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/tests/org.eclipse.uml2.diagram.component.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.diagram.component.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 39c20e7..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.component.tests;singleton:=true
-Bundle-Version: 0.7.1.qualifier
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.emf.ecore,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.notation,
- org.eclipse.gmf.runtime.common.ui,
- org.junit,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.uml2.diagram.component,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.ui.ide;bundle-version="3.4.0",
- org.eclipse.uml2.diagram.common.tests;bundle-version="0.7.1"
-
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/about.html b/tests/org.eclipse.uml2.diagram.component.tests/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/tests/org.eclipse.uml2.diagram.component.tests/build.properties b/tests/org.eclipse.uml2.diagram.component.tests/build.properties
deleted file mode 100644
index 01ff237..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- examples/,\
- plugin.properties,\
- plugin.xml,\
- test.xml
-src.includes = test.xml,\
- about.html
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.14.Example of wiring through dependencies.uml b/tests/org.eclipse.uml2.diagram.component.tests/examples/8.14.Example of wiring through dependencies.uml
deleted file mode 100644
index 0dfc5f5..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.14.Example of wiring through dependencies.uml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_onb80DabEdyiJs_hTQjPKg" name="8.14">
- <elementImport xmi:id="_tSKToDaoEdyDZYshPOuEnw"/>
- <packagedElement xmi:type="uml:Component" xmi:id="_vxV-wDabEdyiJs_hTQjPKg" name="Component">
- <ownedAttribute xmi:type="uml:Port" xmi:id="_qft3oDacEdyiJs_hTQjPKg" name="" type="_sN1mUDacEdyiJs_hTQjPKg" aggregation="composite"/>
- <ownedAttribute xmi:type="uml:Port" xmi:id="_6vs30DadEdyiJs_hTQjPKg" name="" type="_LPJs0DaeEdyiJs_hTQjPKg" aggregation="composite"/>
- <ownedConnector xmi:id="_WGjwsDadEdyiJs_hTQjPKg">
- <end xmi:id="_WHJmkDadEdyiJs_hTQjPKg" role="_qft3oDacEdyiJs_hTQjPKg"/>
- <end xmi:id="_WHJmkTadEdyiJs_hTQjPKg" role="_VIatcDadEdyiJs_hTQjPKg"/>
- </ownedConnector>
- <packagedElement xmi:type="uml:Class" xmi:id="_8hhQMDacEdyiJs_hTQjPKg" name="OrderHeader">
- <ownedAttribute xmi:type="uml:Port" xmi:id="_VIatcDadEdyiJs_hTQjPKg" name="p1" aggregation="composite"/>
- <ownedAttribute xmi:type="uml:Port" xmi:id="_aOwVIDadEdyiJs_hTQjPKg" name="p2" aggregation="composite"/>
- <ownedConnector xmi:id="_sl3PUDadEdyiJs_hTQjPKg">
- <end xmi:id="_sl3PUTadEdyiJs_hTQjPKg" role="_aOwVIDadEdyiJs_hTQjPKg"/>
- <end xmi:id="_sl3PUjadEdyiJs_hTQjPKg" role="_oKSb4DadEdyiJs_hTQjPKg"/>
- </ownedConnector>
- <ownedConnector xmi:id="_2lJtgDaeEdydN9mCFnqHbQ">
- <end xmi:id="_2lTegDaeEdydN9mCFnqHbQ" role="_aOwVIDadEdyiJs_hTQjPKg"/>
- <end xmi:id="_2lTegTaeEdydN9mCFnqHbQ" role="_oKSb4DadEdyiJs_hTQjPKg"/>
- </ownedConnector>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_dpzfsDadEdyiJs_hTQjPKg" name="LineItem">
- <ownedAttribute xmi:type="uml:Port" xmi:id="_oKSb4DadEdyiJs_hTQjPKg" name="p1" aggregation="composite"/>
- <ownedAttribute xmi:type="uml:Port" xmi:id="_810PwDadEdyiJs_hTQjPKg" name="p2" aggregation="composite"/>
- <ownedConnector xmi:id="__s808DadEdyiJs_hTQjPKg">
- <end xmi:id="__s808TadEdyiJs_hTQjPKg" role="_810PwDadEdyiJs_hTQjPKg"/>
- <end xmi:id="__s808jadEdyiJs_hTQjPKg" role="_6vs30DadEdyiJs_hTQjPKg"/>
- </ownedConnector>
- <ownedConnector xmi:id="_4cXGwDaeEdydN9mCFnqHbQ">
- <end xmi:id="_4cXGwTaeEdydN9mCFnqHbQ" role="_810PwDadEdyiJs_hTQjPKg"/>
- <end xmi:id="_4cXGwjaeEdydN9mCFnqHbQ" role="_6vs30DadEdyiJs_hTQjPKg"/>
- </ownedConnector>
- </packagedElement>
- </packagedElement>
- <packagedElement xmi:type="uml:Component" xmi:id="_lkG5QDacEdyiJs_hTQjPKg" name="Account" clientDependency="_0fukADacEdyiJs_hTQjPKg">
- <interfaceRealization xmi:id="_0fukADacEdyiJs_hTQjPKg" supplier="_nlTU8DacEdyiJs_hTQjPKg" client="_lkG5QDacEdyiJs_hTQjPKg" contract="_nlTU8DacEdyiJs_hTQjPKg"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Interface" xmi:id="_nlTU8DacEdyiJs_hTQjPKg" name="account"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="_sN1mUDacEdyiJs_hTQjPKg" name="AccountPayable"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="_LPJs0DaeEdyiJs_hTQjPKg" name="OrderableItem"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="_LvojsDaeEdyiJs_hTQjPKg" name="orderedItem"/>
- <packagedElement xmi:type="uml:Component" xmi:id="_Q4D2EDaeEdyiJs_hTQjPKg" name="Product" clientDependency="_YvH48DaeEdyiJs_hTQjPKg"/>
- <packagedElement xmi:type="uml:Usage" xmi:id="_YvH48DaeEdyiJs_hTQjPKg" supplier="_LvojsDaeEdyiJs_hTQjPKg" client="_Q4D2EDaeEdyiJs_hTQjPKg"/>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.14.Example of wiring through dependencies.umlcomponent_diagram b/tests/org.eclipse.uml2.diagram.component.tests/examples/8.14.Example of wiring through dependencies.umlcomponent_diagram
deleted file mode 100644
index 38caeec..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.14.Example of wiring through dependencies.umlcomponent_diagram
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_o9CZYDabEdyiJs_hTQjPKg" type="UMLComponent" name="8.14.Example of wiring through dependencies.umlcomponent_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_wKrr0DabEdyiJs_hTQjPKg" type="2001">
- <children xmi:type="notation:Node" xmi:id="_wKrr0zabEdyiJs_hTQjPKg" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_wLIXwDabEdyiJs_hTQjPKg" type="7001">
- <children xmi:type="notation:Node" xmi:id="_8h9VEDacEdyiJs_hTQjPKg" type="3004">
- <children xmi:type="notation:Node" xmi:id="_8h9VEzacEdyiJs_hTQjPKg" type="5007"/>
- <children xmi:type="notation:Node" xmi:id="_VItoYDadEdyiJs_hTQjPKg" type="3002">
- <children xmi:type="notation:Node" xmi:id="_VItoYzadEdyiJs_hTQjPKg" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_VItoZDadEdyiJs_hTQjPKg" x="-20" y="35"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_VItoYTadEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Port" href="8.14.Example of wiring through dependencies.uml#_VIatcDadEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VItoYjadEdyiJs_hTQjPKg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_aPDQEDadEdyiJs_hTQjPKg" type="3002">
- <children xmi:type="notation:Node" xmi:id="_aPDQEzadEdyiJs_hTQjPKg" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_aPDQFDadEdyiJs_hTQjPKg" x="35" y="17"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_aPDQETadEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Port" href="8.14.Example of wiring through dependencies.uml#_aOwVIDadEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aPDQEjadEdyiJs_hTQjPKg" x="120" y="150"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_8h9VETacEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Class" href="8.14.Example of wiring through dependencies.uml#_8hhQMDacEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8h9VEjacEdyiJs_hTQjPKg" x="55" y="18" width="151" height="76"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_dpzfsTadEdyiJs_hTQjPKg" type="3004">
- <children xmi:type="notation:Node" xmi:id="_dp8poDadEdyiJs_hTQjPKg" type="5007"/>
- <children xmi:type="notation:Node" xmi:id="_oKl94DadEdyiJs_hTQjPKg" type="3002">
- <children xmi:type="notation:Node" xmi:id="_oKl94zadEdyiJs_hTQjPKg" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_oKl95DadEdyiJs_hTQjPKg" x="-36" y="-20"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_oKl94TadEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Port" href="8.14.Example of wiring through dependencies.uml#_oKSb4DadEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oKl94jadEdyiJs_hTQjPKg" x="120" y="-14"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_819ZsDadEdyiJs_hTQjPKg" type="3002">
- <children xmi:type="notation:Node" xmi:id="_819ZszadEdyiJs_hTQjPKg" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_819ZtDadEdyiJs_hTQjPKg" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_819ZsTadEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Port" href="8.14.Example of wiring through dependencies.uml#_810PwDadEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_819ZsjadEdyiJs_hTQjPKg" x="150" y="30"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_dpzfsjadEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Class" href="8.14.Example of wiring through dependencies.uml#_dpzfsDadEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dpzfszadEdyiJs_hTQjPKg" x="55" y="183" width="151" height="61"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_wLIXwTabEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_wLIXwjabEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_wLIXwzabEdyiJs_hTQjPKg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_qgUUkDacEdyiJs_hTQjPKg" type="3002">
- <children xmi:type="notation:Node" xmi:id="_qgUUkzacEdyiJs_hTQjPKg" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_qgUUlDacEdyiJs_hTQjPKg" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_qgUUkTacEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Port" href="8.14.Example of wiring through dependencies.uml#_qft3oDacEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qgUUkjacEdyiJs_hTQjPKg" x="-14" y="105"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6v2o0DadEdyiJs_hTQjPKg" type="3002">
- <children xmi:type="notation:Node" xmi:id="_6v2o0zadEdyiJs_hTQjPKg" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6v2o1DadEdyiJs_hTQjPKg" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_6v2o0TadEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Port" href="8.14.Example of wiring through dependencies.uml#_6vs30DadEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6v2o0jadEdyiJs_hTQjPKg" x="270" y="255"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_wKrr0TabEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Component" href="8.14.Example of wiring through dependencies.uml#_vxV-wDabEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wKrr0jabEdyiJs_hTQjPKg" x="330" y="15" width="271" height="331"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_xHxmMDabEdyiJs_hTQjPKg" type="Note">
- <children xmi:type="notation:Node" xmi:id="_xHxmMzabEdyiJs_hTQjPKg" type="DiagramName">
- <element xsi:nil="true"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_xHxmNDabEdyiJs_hTQjPKg" type="Description">
- <element xsi:nil="true"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_xHxmMTabEdyiJs_hTQjPKg" description="Not yet completed, 
@see [197263] - Optionally show typed connectors using corresponding association notation

+ missed connectors between interfaces -- interfaces are not StructuredClassifier's, so what is the container? XXX" fillColor="13369343" lineColor="6737151"/>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xHxmMjabEdyiJs_hTQjPKg" x="105" y="360" height="106"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_lkabQDacEdyiJs_hTQjPKg" type="2001">
- <children xmi:type="notation:Node" xmi:id="_lkabQzacEdyiJs_hTQjPKg" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_lkabRDacEdyiJs_hTQjPKg" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_lkabRTacEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_lkabRjacEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_lkabRzacEdyiJs_hTQjPKg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_lkabQTacEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Component" href="8.14.Example of wiring through dependencies.uml#_lkG5QDacEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lkabQjacEdyiJs_hTQjPKg" x="30" y="105"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_nl5x4DacEdyiJs_hTQjPKg" type="2003">
- <children xmi:type="notation:Node" xmi:id="_nmC70DacEdyiJs_hTQjPKg" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nmC70TacEdyiJs_hTQjPKg" x="-20" y="-38"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_nl5x4TacEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Interface" href="8.14.Example of wiring through dependencies.uml#_nlTU8DacEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nl5x4jacEdyiJs_hTQjPKg" x="210" y="90"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_sOIhQDacEdyiJs_hTQjPKg" type="2003">
- <children xmi:type="notation:Node" xmi:id="_sOIhQzacEdyiJs_hTQjPKg" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_sOIhRDacEdyiJs_hTQjPKg" x="-122" y="17"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_sOIhQTacEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Interface" href="8.14.Example of wiring through dependencies.uml#_sN1mUDacEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sOIhQjacEdyiJs_hTQjPKg" x="255" y="120"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_LPcnwDaeEdyiJs_hTQjPKg" type="2003">
- <children xmi:type="notation:Node" xmi:id="_LPcnwzaeEdyiJs_hTQjPKg" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LPcnxDaeEdyiJs_hTQjPKg" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_LPcnwTaeEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Interface" href="8.14.Example of wiring through dependencies.uml#_LPJs0DaeEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LPcnwjaeEdyiJs_hTQjPKg" x="666" y="273"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_LvojsTaeEdyiJs_hTQjPKg" type="2003">
- <children xmi:type="notation:Node" xmi:id="_LvyUsDaeEdyiJs_hTQjPKg" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LvyUsTaeEdyiJs_hTQjPKg" x="-20" y="-38"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_LvojsjaeEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Interface" href="8.14.Example of wiring through dependencies.uml#_LvojsDaeEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LvojszaeEdyiJs_hTQjPKg" x="701" y="196"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Q4WxADaeEdyiJs_hTQjPKg" type="2001">
- <children xmi:type="notation:Node" xmi:id="_Q4WxAzaeEdyiJs_hTQjPKg" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_Q4WxBDaeEdyiJs_hTQjPKg" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_Q4WxBTaeEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Q4WxBjaeEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Q4WxBzaeEdyiJs_hTQjPKg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Q4WxATaeEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Component" href="8.14.Example of wiring through dependencies.uml#_Q4D2EDaeEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q4WxAjaeEdyiJs_hTQjPKg" x="780" y="180"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_jTWhIDaoEdyDZYshPOuEnw" type="2005">
- <children xmi:type="notation:Node" xmi:id="_jTWhIzaoEdyDZYshPOuEnw" type="5011"/>
- <children xmi:type="notation:Node" xmi:id="_jTWhJDaoEdyDZYshPOuEnw" type="7003">
- <children xmi:type="notation:Node" xmi:id="_tS56gDaoEdyDZYshPOuEnw" type="3007">
- <element xmi:type="uml:ElementImport" href="8.14.Example of wiring through dependencies.uml#_tSKToDaoEdyDZYshPOuEnw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tS56gTaoEdyDZYshPOuEnw"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_jTWhJTaoEdyDZYshPOuEnw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_jTWhJjaoEdyDZYshPOuEnw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_jTWhJzaoEdyDZYshPOuEnw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_jTWhITaoEdyDZYshPOuEnw"/>
- <element xmi:type="uml:Package" href="8.14.Example of wiring through dependencies.uml#_onb80DabEdyiJs_hTQjPKg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jTWhIjaoEdyDZYshPOuEnw" y="-4"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_o9CZYTabEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Package" href="8.14.Example of wiring through dependencies.uml#_onb80DabEdyiJs_hTQjPKg"/>
- <edges xmi:type="notation:Edge" xmi:id="_yiHAwDacEdyiJs_hTQjPKg" type="4006" source="_qgUUkDacEdyiJs_hTQjPKg" target="_sOIhQDacEdyiJs_hTQjPKg">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_yiHAwTacEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_yiHAwjacEdyiJs_hTQjPKg"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_yiHAwzacEdyiJs_hTQjPKg" points="[-7, 2, 93, 0]$[-98, 3, 2, 1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ylFcQDacEdyiJs_hTQjPKg" id="(0.8666667,0.6)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_0gKo4DacEdyiJs_hTQjPKg" type="4001" source="_lkabQDacEdyiJs_hTQjPKg" target="_nl5x4DacEdyiJs_hTQjPKg">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_0gKo4TacEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_0gKo4jacEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:InterfaceRealization" href="8.14.Example of wiring through dependencies.uml#_0fukADacEdyiJs_hTQjPKg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0gKo4zacEdyiJs_hTQjPKg" points="[8, 7, -136, -26]$[122, 7, -22, -26]$[141, 30, -3, -3]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0gKo5DacEdyiJs_hTQjPKg" id="(0.92,0.33333334)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_0gKo5TacEdyiJs_hTQjPKg" id="(0.73333335,0.2)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_WHdIkDadEdyiJs_hTQjPKg" type="4008" source="_qgUUkDacEdyiJs_hTQjPKg" target="_VItoYDadEdyiJs_hTQjPKg">
- <styles xmi:type="notation:RoutingStyle" xmi:id="_WHdIkTadEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_WHdIkjadEdyiJs_hTQjPKg"/>
- <element xmi:type="uml:Connector" href="8.14.Example of wiring through dependencies.uml#_WGjwsDadEdyiJs_hTQjPKg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WHdIkzadEdyiJs_hTQjPKg" points="[8, 3, -183, 0]$[188, 5, -3, 2]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_WIC-cDadEdyiJs_hTQjPKg" id="(0.2,0.6666667)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_QeITIDaeEdyiJs_hTQjPKg" type="4006" source="_6v2o0DadEdyiJs_hTQjPKg" target="_LPcnwDaeEdyiJs_hTQjPKg">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_QeITITaeEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_QeITIjaeEdyiJs_hTQjPKg"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QeITIzaeEdyiJs_hTQjPKg" points="[8, 1, -58, -2]$[66, -4, 0, -7]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_YvH48TaeEdyiJs_hTQjPKg" type="4007" source="_Q4WxADaeEdyiJs_hTQjPKg" target="_LvojsTaeEdyiJs_hTQjPKg">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_YvH48jaeEdyiJs_hTQjPKg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_YvH48zaeEdyiJs_hTQjPKg"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YvH49DaeEdyiJs_hTQjPKg" points="[-8, 4, 72, -41]$[-87, 44, -7, -1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Yvkk4DaeEdyiJs_hTQjPKg" id="(0.08,0.25555557)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_2l5UYDaeEdydN9mCFnqHbQ" type="4008" source="_aPDQEDadEdyiJs_hTQjPKg" target="_oKl94DadEdyiJs_hTQjPKg">
- <styles xmi:type="notation:RoutingStyle" xmi:id="_2l5UYTaeEdydN9mCFnqHbQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_2l5UYjaeEdydN9mCFnqHbQ"/>
- <element xmi:type="uml:Connector" href="8.14.Example of wiring through dependencies.uml#_2lJtgDaeEdydN9mCFnqHbQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2l5UYzaeEdydN9mCFnqHbQ" points="[-2, 8, -2, -68]$[-7, 76, -7, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_4cXGwzaeEdydN9mCFnqHbQ" type="4008" source="_819ZsDadEdyiJs_hTQjPKg" target="_6v2o0DadEdyiJs_hTQjPKg">
- <styles xmi:type="notation:RoutingStyle" xmi:id="_4cXGxDaeEdydN9mCFnqHbQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_4cXGxTaeEdydN9mCFnqHbQ"/>
- <element xmi:type="uml:Connector" href="8.14.Example of wiring through dependencies.uml#_4cXGwDaeEdydN9mCFnqHbQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4cXGxjaeEdydN9mCFnqHbQ" points="[8, 6, -52, 2]$[59, 12, -1, 8]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4cg3wDaeEdydN9mCFnqHbQ" id="(0.46666667,0.2)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.16.Delegation connectors.uml b/tests/org.eclipse.uml2.diagram.component.tests/examples/8.16.Delegation connectors.uml
deleted file mode 100644
index 6e6abf7..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.16.Delegation connectors.uml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_dn5zgDajEdyCLZBPNn2ARw" name="8.16">
- <packagedElement xmi:type="uml:Component" xmi:id="_fLvk0DajEdyCLZBPNn2ARw" name="Order">
- <ownedAttribute xmi:id="_oWZWgDajEdyCLZBPNn2ARw" name=": OrderHeader"/>
- <ownedAttribute xmi:id="_rpQOYDajEdyCLZBPNn2ARw" name=": LineItem"/>
- <ownedAttribute xmi:type="uml:Port" xmi:id="_zvqU0DajEdyCLZBPNn2ARw" name="" type="_yWaC4DajEdyCLZBPNn2ARw" aggregation="composite"/>
- <ownedAttribute xmi:type="uml:Port" xmi:id="_4nsawDajEdyCLZBPNn2ARw" name="" aggregation="composite"/>
- <ownedConnector xmi:id="_2PZtsDajEdyCLZBPNn2ARw">
- <end xmi:id="_2PZtsTajEdyCLZBPNn2ARw" role="_zvqU0DajEdyCLZBPNn2ARw"/>
- <end xmi:id="_2PZtsjajEdyCLZBPNn2ARw" role="_oWZWgDajEdyCLZBPNn2ARw"/>
- </ownedConnector>
- <ownedConnector xmi:id="_21jHsDajEdyCLZBPNn2ARw">
- <end xmi:id="_21jHsTajEdyCLZBPNn2ARw" role="_oWZWgDajEdyCLZBPNn2ARw"/>
- <end xmi:id="_21jHsjajEdyCLZBPNn2ARw" role="_rpQOYDajEdyCLZBPNn2ARw"/>
- </ownedConnector>
- <ownedConnector xmi:id="_3VcIsDajEdyCLZBPNn2ARw">
- <end xmi:id="_3VcIsTajEdyCLZBPNn2ARw" role="_zvqU0DajEdyCLZBPNn2ARw"/>
- <end xmi:id="_3VcIsjajEdyCLZBPNn2ARw" role="_rpQOYDajEdyCLZBPNn2ARw"/>
- </ownedConnector>
- <ownedConnector xmi:id="_6O9TgDajEdyCLZBPNn2ARw">
- <end xmi:id="_6O9TgTajEdyCLZBPNn2ARw" role="_rpQOYDajEdyCLZBPNn2ARw"/>
- <end xmi:id="_6O9TgjajEdyCLZBPNn2ARw" role="_4nsawDajEdyCLZBPNn2ARw"/>
- </ownedConnector>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_gzTYgDajEdyCLZBPNn2ARw" name="OrderHeader"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_ievmoDajEdyCLZBPNn2ARw" name="LineItem"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="_yWaC4DajEdyCLZBPNn2ARw" name="OrderEntry"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="_8x-p4DajEdyCLZBPNn2ARw" name="Person"/>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.16.Delegation connectors.umlcomponent_diagram b/tests/org.eclipse.uml2.diagram.component.tests/examples/8.16.Delegation connectors.umlcomponent_diagram
deleted file mode 100644
index e233c72..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.16.Delegation connectors.umlcomponent_diagram
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_doWfcDajEdyCLZBPNn2ARw" type="UMLComponent" name="8.16.Delegation connectors.umlcomponent_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_fN-ZcDajEdyCLZBPNn2ARw" type="2001">
- <children xmi:type="notation:Node" xmi:id="_fN-ZczajEdyCLZBPNn2ARw" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_fN-ZdDajEdyCLZBPNn2ARw" type="7001">
- <children xmi:type="notation:Node" xmi:id="_oWjHgDajEdyCLZBPNn2ARw" type="3006">
- <children xmi:type="notation:Node" xmi:id="_oWjHgzajEdyCLZBPNn2ARw" type="5010"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_oWjHgTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Property" href="8.16.Delegation connectors.uml#_oWZWgDajEdyCLZBPNn2ARw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oWjHgjajEdyCLZBPNn2ARw" x="115" y="18" width="136" height="61"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_rpQOYTajEdyCLZBPNn2ARw" type="3006">
- <children xmi:type="notation:Node" xmi:id="_rpQOZDajEdyCLZBPNn2ARw" type="5010"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_rpQOYjajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Property" href="8.16.Delegation connectors.uml#_rpQOYDajEdyCLZBPNn2ARw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rpQOYzajEdyCLZBPNn2ARw" x="115" y="138" width="136" height="61"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_fN-ZdTajEdyCLZBPNn2ARw"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_fN-ZdjajEdyCLZBPNn2ARw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_fN-ZdzajEdyCLZBPNn2ARw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zwHAwDajEdyCLZBPNn2ARw" type="3002">
- <children xmi:type="notation:Node" xmi:id="_zwHAwzajEdyCLZBPNn2ARw" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zwHAxDajEdyCLZBPNn2ARw" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zwHAwTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Port" href="8.16.Delegation connectors.uml#_zvqU0DajEdyCLZBPNn2ARw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zwHAwjajEdyCLZBPNn2ARw" x="-14" y="105"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_4n1ksDajEdyCLZBPNn2ARw" type="3002">
- <children xmi:type="notation:Node" xmi:id="_4n1kszajEdyCLZBPNn2ARw" type="5003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4n1ktDajEdyCLZBPNn2ARw" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_4n1ksTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Port" href="8.16.Delegation connectors.uml#_4nsawDajEdyCLZBPNn2ARw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4n1ksjajEdyCLZBPNn2ARw" x="375" y="210"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_fN-ZcTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Component" href="8.16.Delegation connectors.uml#_fLvk0DajEdyCLZBPNn2ARw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fN-ZcjajEdyCLZBPNn2ARw" x="210" y="45" width="376" height="271"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_gzwEcDajEdyCLZBPNn2ARw" type="2004">
- <children xmi:type="notation:Node" xmi:id="_gzwEczajEdyCLZBPNn2ARw" type="5008"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_gzwEcTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Class" href="8.16.Delegation connectors.uml#_gzTYgDajEdyCLZBPNn2ARw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gzwEcjajEdyCLZBPNn2ARw" x="630" y="45" width="120"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_ie4wkDajEdyCLZBPNn2ARw" type="2004">
- <children xmi:type="notation:Node" xmi:id="_ifChkDajEdyCLZBPNn2ARw" type="5008"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_ie4wkTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Class" href="8.16.Delegation connectors.uml#_ievmoDajEdyCLZBPNn2ARw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ie4wkjajEdyCLZBPNn2ARw" x="630" y="120" width="121"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_yW2u0DajEdyCLZBPNn2ARw" type="2003">
- <children xmi:type="notation:Node" xmi:id="_yW_4wDajEdyCLZBPNn2ARw" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_yW_4wTajEdyCLZBPNn2ARw" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_yW2u0TajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Interface" href="8.16.Delegation connectors.uml#_yWaC4DajEdyCLZBPNn2ARw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yW2u0jajEdyCLZBPNn2ARw" x="119" y="155"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8yRk0DajEdyCLZBPNn2ARw" type="2003">
- <children xmi:type="notation:Node" xmi:id="_8yRk0zajEdyCLZBPNn2ARw" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8yRk1DajEdyCLZBPNn2ARw" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_8yRk0TajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Interface" href="8.16.Delegation connectors.uml#_8x-p4DajEdyCLZBPNn2ARw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8yRk0jajEdyCLZBPNn2ARw" x="675" y="255"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_doWfcTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Package" href="8.16.Delegation connectors.uml#_dn5zgDajEdyCLZBPNn2ARw"/>
- <edges xmi:type="notation:Edge" xmi:id="_1MpQMDajEdyCLZBPNn2ARw" type="4006" source="_zwHAwDajEdyCLZBPNn2ARw" target="_yW2u0DajEdyCLZBPNn2ARw">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_1MpQMTajEdyCLZBPNn2ARw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_1MpQMjajEdyCLZBPNn2ARw"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1MpQMzajEdyCLZBPNn2ARw" points="[0, 9, 190, 2]$[-190, 15, 0, 8]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1MzBMDajEdyCLZBPNn2ARw" id="(0.0,0.33333334)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_2PZtszajEdyCLZBPNn2ARw" type="4008" source="_zwHAwDajEdyCLZBPNn2ARw" target="_oWjHgDajEdyCLZBPNn2ARw">
- <styles xmi:type="notation:RoutingStyle" xmi:id="_2PZttDajEdyCLZBPNn2ARw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_2PZttTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Connector" href="8.16.Delegation connectors.uml#_2PZtsDajEdyCLZBPNn2ARw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2PZttjajEdyCLZBPNn2ARw" points="[8, -1, -129, 8]$[127, -7, -10, 2]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2PZttzajEdyCLZBPNn2ARw" id="(0.073529415,0.704918)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_21jHszajEdyCLZBPNn2ARw" type="4008" source="_oWjHgDajEdyCLZBPNn2ARw" target="_rpQOYTajEdyCLZBPNn2ARw">
- <styles xmi:type="notation:RoutingStyle" xmi:id="_21jHtDajEdyCLZBPNn2ARw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_21jHtTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Connector" href="8.16.Delegation connectors.uml#_21jHsDajEdyCLZBPNn2ARw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_21jHtjajEdyCLZBPNn2ARw" points="[5, 31, 5, -89]$[68, 111, 68, -9]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_3VcIszajEdyCLZBPNn2ARw" type="4008" source="_zwHAwDajEdyCLZBPNn2ARw" target="_rpQOYTajEdyCLZBPNn2ARw">
- <styles xmi:type="notation:RoutingStyle" xmi:id="_3VcItDajEdyCLZBPNn2ARw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_3VcItTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Connector" href="8.16.Delegation connectors.uml#_3VcIsDajEdyCLZBPNn2ARw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3VcItjajEdyCLZBPNn2ARw" points="[8, 5, -187, -93]$[127, 98, -68, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_6O9TgzajEdyCLZBPNn2ARw" type="4008" source="_rpQOYTajEdyCLZBPNn2ARw" target="_4n1ksDajEdyCLZBPNn2ARw">
- <styles xmi:type="notation:RoutingStyle" xmi:id="_6O9ThDajEdyCLZBPNn2ARw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_6O9ThTajEdyCLZBPNn2ARw"/>
- <element xmi:type="uml:Connector" href="8.16.Delegation connectors.uml#_6O9TgDajEdyCLZBPNn2ARw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6O9ThjajEdyCLZBPNn2ARw" points="[10, 1, -126, -8]$[136, 17, 0, 8]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6PHEgDajEdyCLZBPNn2ARw" id="(0.9264706,0.45901638)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.6.Component with provided and required interfaces.uml b/tests/org.eclipse.uml2.diagram.component.tests/examples/8.6.Component with provided and required interfaces.uml
deleted file mode 100644
index 53fa454..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.6.Component with provided and required interfaces.uml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_4VrgsDaCEdyxWaLK9gIZpw" name="8.6">
- <packagedElement xmi:type="uml:Component" xmi:id="_5ZegADaCEdyxWaLK9gIZpw" name="Order" clientDependency="_GjGBoDaDEdyxWaLK9gIZpw _If9-ADaDEdyxWaLK9gIZpw _beQEkDaREdyUXOQc_jGHKg _eqZQcDaREdyUXOQc_jGHKg _fWDckDaREdyUXOQc_jGHKg">
- <interfaceRealization xmi:id="_GjGBoDaDEdyxWaLK9gIZpw" supplier="_7iaicDaCEdyxWaLK9gIZpw" client="_5ZegADaCEdyxWaLK9gIZpw" contract="_7iaicDaCEdyxWaLK9gIZpw"/>
- <interfaceRealization xmi:id="_If9-ADaDEdyxWaLK9gIZpw" supplier="_94nk0DaCEdyxWaLK9gIZpw" client="_5ZegADaCEdyxWaLK9gIZpw" contract="_94nk0DaCEdyxWaLK9gIZpw"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Interface" xmi:id="_7iaicDaCEdyxWaLK9gIZpw" name="ItemAllocation"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="_94nk0DaCEdyxWaLK9gIZpw" name="Tracking"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="__Y4dsDaCEdyxWaLK9gIZpw" name="Person"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="_AmhVgDaDEdyxWaLK9gIZpw" name="Invoice"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="_CDgQ4DaDEdyxWaLK9gIZpw" name="OrderableItem"/>
- <packagedElement xmi:type="uml:Usage" xmi:id="_beQEkDaREdyUXOQc_jGHKg" supplier="_CDgQ4DaDEdyxWaLK9gIZpw" client="_5ZegADaCEdyxWaLK9gIZpw"/>
- <packagedElement xmi:type="uml:Usage" xmi:id="_eqZQcDaREdyUXOQc_jGHKg" supplier="__Y4dsDaCEdyxWaLK9gIZpw" client="_5ZegADaCEdyxWaLK9gIZpw"/>
- <packagedElement xmi:type="uml:Usage" xmi:id="_fWDckDaREdyUXOQc_jGHKg" supplier="_AmhVgDaDEdyxWaLK9gIZpw" client="_5ZegADaCEdyxWaLK9gIZpw"/>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.6.Component with provided and required interfaces.umlcomponent_diagram b/tests/org.eclipse.uml2.diagram.component.tests/examples/8.6.Component with provided and required interfaces.umlcomponent_diagram
deleted file mode 100644
index bf5d246..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/examples/8.6.Component with provided and required interfaces.umlcomponent_diagram
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_4VrgsTaCEdyxWaLK9gIZpw" type="UMLComponent" name="8.6.Component with provided and required interfaces.umlcomponent_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_5Z7L8DaCEdyxWaLK9gIZpw" type="2001">
- <children xmi:type="notation:Node" xmi:id="_5Z7L8zaCEdyxWaLK9gIZpw" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_5Z7L9DaCEdyxWaLK9gIZpw" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_5Z7L9TaCEdyxWaLK9gIZpw" collapsed="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5Z7L9jaCEdyxWaLK9gIZpw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5Z7L9zaCEdyxWaLK9gIZpw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_5Z7L8TaCEdyxWaLK9gIZpw"/>
- <element xmi:type="uml:Component" href="8.6.Component with provided and required interfaces.uml#_5ZegADaCEdyxWaLK9gIZpw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5Z7L8jaCEdyxWaLK9gIZpw" x="195" y="135" width="181" height="90"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_7iuEcDaCEdyxWaLK9gIZpw" type="2003">
- <children xmi:type="notation:Node" xmi:id="_7iuEczaCEdyxWaLK9gIZpw" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_7iuEdDaCEdyxWaLK9gIZpw" x="-20" y="-38"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_7iuEcTaCEdyxWaLK9gIZpw"/>
- <element xmi:type="uml:Interface" href="8.6.Component with provided and required interfaces.uml#_7iaicDaCEdyxWaLK9gIZpw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7iuEcjaCEdyxWaLK9gIZpw" x="90" y="135"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_94xV0DaCEdyxWaLK9gIZpw" type="2003">
- <children xmi:type="notation:Node" xmi:id="_94xV0zaCEdyxWaLK9gIZpw" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_94xV1DaCEdyxWaLK9gIZpw" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_94xV0TaCEdyxWaLK9gIZpw"/>
- <element xmi:type="uml:Interface" href="8.6.Component with provided and required interfaces.uml#_94nk0DaCEdyxWaLK9gIZpw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_94xV0jaCEdyxWaLK9gIZpw" x="90" y="180"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__ZLYoDaCEdyxWaLK9gIZpw" type="2003">
- <children xmi:type="notation:Node" xmi:id="__ZLYozaCEdyxWaLK9gIZpw" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="__ZLYpDaCEdyxWaLK9gIZpw" x="-20" y="-38"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__ZLYoTaCEdyxWaLK9gIZpw"/>
- <element xmi:type="uml:Interface" href="8.6.Component with provided and required interfaces.uml#__Y4dsDaCEdyxWaLK9gIZpw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__ZLYojaCEdyxWaLK9gIZpw" x="495" y="135"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Am0QcDaDEdyxWaLK9gIZpw" type="2003">
- <children xmi:type="notation:Node" xmi:id="_Am0QczaDEdyxWaLK9gIZpw" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Am0QdDaDEdyxWaLK9gIZpw" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Am0QcTaDEdyxWaLK9gIZpw"/>
- <element xmi:type="uml:Interface" href="8.6.Component with provided and required interfaces.uml#_AmhVgDaDEdyxWaLK9gIZpw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Am0QcjaDEdyxWaLK9gIZpw" x="495" y="195"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_CDzL0DaDEdyxWaLK9gIZpw" type="2003">
- <children xmi:type="notation:Node" xmi:id="_CDzL0zaDEdyxWaLK9gIZpw" type="5005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_CDzL1DaDEdyxWaLK9gIZpw" x="-20" y="35"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_CDzL0TaDEdyxWaLK9gIZpw"/>
- <element xmi:type="uml:Interface" href="8.6.Component with provided and required interfaces.uml#_CDgQ4DaDEdyxWaLK9gIZpw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CDzL0jaDEdyxWaLK9gIZpw" x="300" y="300"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_4VrgsjaCEdyxWaLK9gIZpw"/>
- <element xmi:type="uml:Package" href="8.6.Component with provided and required interfaces.uml#_4VrgsDaCEdyxWaLK9gIZpw"/>
- <edges xmi:type="notation:Edge" xmi:id="_GkIjcDaDEdyxWaLK9gIZpw" type="4001" source="_5Z7L8DaCEdyxWaLK9gIZpw" target="_7iuEcDaCEdyxWaLK9gIZpw">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_GkIjcTaDEdyxWaLK9gIZpw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_GkIjcjaDEdyxWaLK9gIZpw"/>
- <element xmi:type="uml:InterfaceRealization" href="8.6.Component with provided and required interfaces.uml#_GjGBoDaDEdyxWaLK9gIZpw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GkIjczaDEdyxWaLK9gIZpw" points="[-51, 7, 276, 0]$[-329, 5, -2, -2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GoT40DaDEdyxWaLK9gIZpw" id="(0.16558442,0.13178295)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GoT40TaDEdyxWaLK9gIZpw" id="(0.13333334,0.13333334)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_If9-ATaDEdyxWaLK9gIZpw" type="4001" source="_5Z7L8DaCEdyxWaLK9gIZpw" target="_94xV0DaCEdyxWaLK9gIZpw">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_If9-AjaDEdyxWaLK9gIZpw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_If9-AzaDEdyxWaLK9gIZpw"/>
- <element xmi:type="uml:InterfaceRealization" href="8.6.Component with provided and required interfaces.uml#_If9-ADaDEdyxWaLK9gIZpw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_If9-BDaDEdyxWaLK9gIZpw" points="[-77, 19, 262, -65]$[-336, 85, 3, 1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_If9-BTaDEdyxWaLK9gIZpw" id="(0.25,0.15503876)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_If9-BjaDEdyxWaLK9gIZpw" id="(0.8,0.6)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_bfJccDaREdyUXOQc_jGHKg" type="4007" source="_5Z7L8DaCEdyxWaLK9gIZpw" target="_CDzL0DaDEdyxWaLK9gIZpw">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_bfJccTaREdyUXOQc_jGHKg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_bfJccjaREdyUXOQc_jGHKg"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bfJcczaREdyUXOQc_jGHKg" points="[-15, 72, 27, -127]$[-41, 192, 1, -7]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bfvSUDaREdyUXOQc_jGHKg" id="(0.6461039,0.2)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_eqZQcTaREdyUXOQc_jGHKg" type="4007" source="_5Z7L8DaCEdyxWaLK9gIZpw" target="__ZLYoDaCEdyxWaLK9gIZpw">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_eqZQcjaREdyUXOQc_jGHKg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_eqZQczaREdyUXOQc_jGHKg"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_eqZQdDaREdyUXOQc_jGHKg" points="[8, 0, -135, 7]$[114, 0, -29, 7]$[142, -10, -1, -3]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eqZQdTaREdyUXOQc_jGHKg" id="(0.9577922,0.21111111)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_eqZQdjaREdyUXOQc_jGHKg" id="(0.06666667,0.8)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_fWDckTaREdyUXOQc_jGHKg" type="4007" source="_5Z7L8DaCEdyxWaLK9gIZpw" target="_Am0QcDaDEdyxWaLK9gIZpw">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_fWDckjaREdyUXOQc_jGHKg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_fWDckzaREdyUXOQc_jGHKg"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fWDclDaREdyUXOQc_jGHKg" points="[18, 5, -121, -34]$[137, 38, -2, -1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fWDclTaREdyUXOQc_jGHKg" id="(0.9025974,0.31111112)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MiYFsDaSEdyUXOQc_jGHKg" id="(0.13333334,0.46666667)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/plugin.properties b/tests/org.eclipse.uml2.diagram.component.tests/plugin.properties
deleted file mode 100644
index f186a46..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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=UML2 Component Diagram Tests Plug-in (Incubation)
-providerName=Eclipse.org
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/plugin.xml b/tests/org.eclipse.uml2.diagram.component.tests/plugin.xml
deleted file mode 100644
index 17ce305..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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:
- Tatiana Fesenko (Borland) - initial API and implementation
--->
-
-<plugin>
-</plugin>
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/AllTests.java b/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/AllTests.java
deleted file mode 100644
index 86cb8d5..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/AllTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.uml2.diagram.component.tests;
-
-import org.eclipse.uml2.diagram.component.tests.tool.ChildrenGroupTest;
-import org.eclipse.uml2.diagram.component.tests.tool.NodesGroupTest;
-import org.eclipse.uml2.diagram.component.tests.whole.TestWholeDiagramSuite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.uml2.diagram.component");
- //$JUnit-BEGIN$
- suite.addTest(new TestWholeDiagramSuite());
- suite.addTestSuite(NodesGroupTest.class);
- suite.addTestSuite(ChildrenGroupTest.class);
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/ComponentDiagramFacade.java b/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/ComponentDiagramFacade.java
deleted file mode 100644
index c9c414c..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/ComponentDiagramFacade.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.uml2.diagram.component.tests;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.component.part.UMLDiagramEditorUtil;
-
-public class ComponentDiagramFacade extends UMLDiagramFacade {
-
- public ComponentDiagramFacade(String path) {
- super(path, DIAGRAM_FILE_EXTENSION);
- }
-
- @Override
- protected Resource createDiagram(URI diagramModelURI, URI domainModelURI) {
- return UMLDiagramEditorUtil.createDiagram(diagramModelURI, domainModelURI, new NullProgressMonitor());
- }
-
- public static final String DIAGRAM_FILE_EXTENSION = "umlcomponent_diagram";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/tool/ChildrenGroupTest.java b/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/tool/ChildrenGroupTest.java
deleted file mode 100644
index 95343c5..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/tool/ChildrenGroupTest.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package org.eclipse.uml2.diagram.component.tests.tool;
-
-import java.util.Collections;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.uml2.diagram.component.edit.parts.ClassAttributesEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ClassDiagramNotationClassEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ClassDiagramNotationOperationEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ClassDiagramNotationPropertyEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ClassOperationsEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ElementImportEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.Package2EditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.PackageImportsEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.PortOnClassEditPart;
-import org.eclipse.uml2.diagram.component.part.UMLPaletteFactory;
-import org.eclipse.uml2.diagram.component.part.UMLVisualIDRegistry;
-
-public class ChildrenGroupTest extends ComponentDCreationToolTestBase {
-
- /**
- * @generated
- */
- PaletteRoot myRoot;
-
- /**
- * @generated
- */
- Tool myElementImportTool;
-
- /**
- * @generated
- */
- Tool myAttributeTool;
-
- /**
- * @generated
- */
- Tool myOperationTool;
-
- /**
- * @generated
- */
- Tool myPortTool;
-
- /**
- * @generated
- */
- protected void setUp() throws Exception {
- super.setUp();
- myRoot = new PaletteRoot();
- new UMLPaletteFactory().fillPalette(myRoot);
- myElementImportTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(2)).getChildren().get(0)).createTool();
- myAttributeTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(2)).getChildren().get(1)).createTool();
- myOperationTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(2)).getChildren().get(2)).createTool();
- myPortTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(2)).getChildren().get(3)).createTool();
- }
-
- /**
- * @generated
- */
- protected void tearDown() throws Exception {
- myRoot = null;
- myElementImportTool = null;
- myAttributeTool = null;
- myOperationTool = null;
- myPortTool = null;
-
- super.tearDown();
- }
-
- /**
- * @generated
- */
- public ChildrenGroupTest(String name) {
- super(name);
- }
-
- /**
- * @generated
- */
- public void testElementImport() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- IGraphicalEditPart editPart1 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Package2EditPart.VISUAL_ID));
- assertNotNull(editPart1);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment1 = editPart1.getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageImportsEditPart.VISUAL_ID));
- assertNotNull(compartment1);
-
- createNodeByTool(myElementImportTool, 10, 10);
-
- IGraphicalEditPart editPart2 = compartment1.getChildBySemanticHint(UMLVisualIDRegistry.getType(ElementImportEditPart.VISUAL_ID));
- assertNotNull(editPart2);
- assertEquals("ElementImport", getMetaclassName(editPart2));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPropertyInClassDiagramNotation() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool1;
- tool1 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Class_2007")));
-
- createNodeByTool(tool1, 200, 100);
-
- IGraphicalEditPart editPart3 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassDiagramNotationClassEditPart.VISUAL_ID));
- assertNotNull(editPart3);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment2 = editPart3.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassAttributesEditPart.VISUAL_ID));
- assertNotNull(compartment2);
-
- createNodeByTool(myAttributeTool, 201, 101);
-
- IGraphicalEditPart editPart4 = compartment2.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassDiagramNotationPropertyEditPart.VISUAL_ID));
- assertNotNull(editPart4);
- assertEquals("Class", getMetaclassName(editPart4));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testOperationInClassDiagramNotation() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool2;
- tool2 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Class_2007")));
-
- createNodeByTool(tool2, 200, 100);
-
- IGraphicalEditPart editPart5 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassDiagramNotationClassEditPart.VISUAL_ID));
- assertNotNull(editPart5);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment3 = editPart5.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationsEditPart.VISUAL_ID));
- assertNotNull(compartment3);
-
- createNodeByTool(myOperationTool, 201, 101);
-
- IGraphicalEditPart editPart6 = compartment3.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassDiagramNotationOperationEditPart.VISUAL_ID));
- assertNotNull(editPart6);
- assertEquals("Operation", getMetaclassName(editPart6));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPortOnClassDiagramNotation() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool3;
- tool3 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Class_2007")));
-
- createNodeByTool(tool3, 200, 100);
-
- IGraphicalEditPart editPart7 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassDiagramNotationClassEditPart.VISUAL_ID));
- assertNotNull(editPart7);
-
- getDiagramEditPart().getViewer().flush();
-
- createNodeByTool(myPortTool, 201, 101);
-
- IGraphicalEditPart editPart8 = editPart7.getChildBySemanticHint(UMLVisualIDRegistry.getType(PortOnClassEditPart.VISUAL_ID));
- assertNotNull(editPart8);
- assertEquals("Port", getMetaclassName(editPart8));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
-
- private static java.lang.String getMetaclassName(IGraphicalEditPart editPart) {
- return editPart.getNotationView().getElement().eClass().getName();
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/tool/ComponentDCreationToolTestBase.java b/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/tool/ComponentDCreationToolTestBase.java
deleted file mode 100644
index 5f4976b..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/tool/ComponentDCreationToolTestBase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.uml2.diagram.component.tests.tool;
-
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.common.tool.CreationToolTestBase;
-
-public class ComponentDCreationToolTestBase extends CreationToolTestBase {
-
- public ComponentDCreationToolTestBase(String name) {
- super(name);
- }
-
- @Override
- protected UMLDiagramFacade getDiagram(String projectPath) {
- return new org.eclipse.uml2.diagram.component.tests.ComponentDiagramFacade(projectPath);
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/tool/NodesGroupTest.java b/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/tool/NodesGroupTest.java
deleted file mode 100644
index 8d81c67..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/tool/NodesGroupTest.java
+++ /dev/null
@@ -1,444 +0,0 @@
-package org.eclipse.uml2.diagram.component.tests.tool;
-
-import java.util.Collections;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.uml2.diagram.component.edit.parts.Artifact2EditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ArtifactEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.Class2EditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.Class3EditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ClassClassesEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ClassDiagramNotationClassEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ClassDiagramNotationInnerClassEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ClassEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.Component2EditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.Component3EditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ComponentContentsEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.ComponentEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.Interface2EditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.InterfaceEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.Package3EditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.Package4EditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.PackageClassifiersEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.PackagePackagesEditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.PropertyEditPart;
-import org.eclipse.uml2.diagram.component.part.UMLPaletteFactory;
-import org.eclipse.uml2.diagram.component.part.UMLVisualIDRegistry;
-
-public class NodesGroupTest extends ComponentDCreationToolTestBase {
-
- /**
- * @generated
- */
- PaletteRoot myRoot;
-
- /**
- * @generated
- */
- Tool myComponentTool;
-
- /**
- * @generated
- */
- Tool myArtifactTool;
-
- /**
- * @generated
- */
- Tool myInterfaceTool;
-
- /**
- * @generated
- */
- Tool myClassTool;
-
- /**
- * @generated
- */
- Tool myPartTool;
-
- /**
- * @generated
- */
- Tool myPackageTool;
-
- /**
- * @generated
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- myRoot = new PaletteRoot();
- new UMLPaletteFactory().fillPalette(myRoot);
- myComponentTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(0)).createTool();
- myArtifactTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(1)).createTool();
- myInterfaceTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(2)).createTool();
- myClassTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(3)).createTool();
- myPartTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(4)).createTool();
- myPackageTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(5)).createTool();
- }
-
- /**
- * @generated
- */
- @Override
- protected void tearDown() throws Exception {
- myRoot = null;
- myComponentTool = null;
- myArtifactTool = null;
- myInterfaceTool = null;
- myClassTool = null;
- myPartTool = null;
- myPackageTool = null;
-
- super.tearDown();
- }
-
- /**
- * @generated
- */
- public NodesGroupTest(String name) {
- super(name);
- }
-
- /**
- * @generated
- */
- public void testComponentOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myComponentTool, 200, 100);
-
- IGraphicalEditPart editPart1 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentEditPart.VISUAL_ID));
- assertNotNull(editPart1);
- assertEquals("Component", getMetaclassName(editPart1));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testArtifactOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myArtifactTool, 200, 100);
-
- IGraphicalEditPart editPart2 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Artifact2EditPart.VISUAL_ID));
- assertNotNull(editPart2);
- assertEquals("Artifact", getMetaclassName(editPart2));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testInterfaceOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myInterfaceTool, 200, 100);
-
- IGraphicalEditPart editPart3 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Interface2EditPart.VISUAL_ID));
- assertNotNull(editPart3);
- assertEquals("Interface", getMetaclassName(editPart3));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testClassOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myClassTool, 200, 100);
-
- IGraphicalEditPart editPart4 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Class2EditPart.VISUAL_ID));
- assertNotNull(editPart4);
- assertEquals("Class", getMetaclassName(editPart4));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPartInComponent() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool1;
- tool1 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Component_2001")));
-
- createNodeByTool(tool1, 200, 100);
-
- IGraphicalEditPart editPart5 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentEditPart.VISUAL_ID));
- assertNotNull(editPart5);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment1 = editPart5.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentContentsEditPart.VISUAL_ID));
- assertNotNull(compartment1);
-
- createNodeByTool(myPartTool, 201, 170);
-
- IGraphicalEditPart editPart6 = compartment1.getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyEditPart.VISUAL_ID));
- assertNotNull(editPart6);
- assertEquals("Property", getMetaclassName(editPart6));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPackageOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myPackageTool, 200, 100);
-
- IGraphicalEditPart editPart7 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Package3EditPart.VISUAL_ID));
- assertNotNull(editPart7);
- assertEquals("Package", getMetaclassName(editPart7));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testComponentInComponent() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool2;
- tool2 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Component_2001")));
-
- createNodeByTool(tool2, 200, 100);
-
- IGraphicalEditPart editPart8 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentEditPart.VISUAL_ID));
- assertNotNull(editPart8);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment2 = editPart8.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentContentsEditPart.VISUAL_ID));
- assertNotNull(compartment2);
-
- createNodeByTool(myComponentTool, 201, 150);
-
- IGraphicalEditPart editPart9 = compartment2.getChildBySemanticHint(UMLVisualIDRegistry.getType(Component2EditPart.VISUAL_ID));
- assertNotNull(editPart9);
- assertEquals("Component", getMetaclassName(editPart9));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testComponentInPackage() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool3;
- tool3 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Package_2006")));
-
- createNodeByTool(tool3, 200, 100);
-
- IGraphicalEditPart editPart10 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Package3EditPart.VISUAL_ID));
- assertNotNull(editPart10);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment3 = editPart10.getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageClassifiersEditPart.VISUAL_ID));
- assertNotNull(compartment3);
-
- createNodeByTool(myComponentTool, 201, 101);
-
- IGraphicalEditPart editPart11 = compartment3.getChildBySemanticHint(UMLVisualIDRegistry.getType(Component3EditPart.VISUAL_ID));
- assertNotNull(editPart11);
- assertEquals("Component", getMetaclassName(editPart11));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testArtifactInComponent() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool4;
- tool4 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Component_2001")));
-
- createNodeByTool(tool4, 200, 100);
-
- IGraphicalEditPart editPart12 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentEditPart.VISUAL_ID));
- assertNotNull(editPart12);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment4 = editPart12.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentContentsEditPart.VISUAL_ID));
- assertNotNull(compartment4);
-
- createNodeByTool(myArtifactTool, 201, 150);
-
- IGraphicalEditPart editPart13 = compartment4.getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactEditPart.VISUAL_ID));
- assertNotNull(editPart13);
- assertEquals("Artifact", getMetaclassName(editPart13));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testInterfaceInComponent() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool5;
- tool5 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Component_2001")));
-
- createNodeByTool(tool5, 200, 100);
-
- IGraphicalEditPart editPart14 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentEditPart.VISUAL_ID));
- assertNotNull(editPart14);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment5 = editPart14.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentContentsEditPart.VISUAL_ID));
- assertNotNull(compartment5);
-
- createNodeByTool(myInterfaceTool, 201, 150);
-
- IGraphicalEditPart editPart15 = compartment5.getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceEditPart.VISUAL_ID));
- assertNotNull(editPart15);
- assertEquals("Interface", getMetaclassName(editPart15));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testClassInComponent() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool6;
- tool6 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Component_2001")));
-
- createNodeByTool(tool6, 200, 100);
-
- IGraphicalEditPart editPart16 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentEditPart.VISUAL_ID));
- assertNotNull(editPart16);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment6 = editPart16.getChildBySemanticHint(UMLVisualIDRegistry.getType(ComponentContentsEditPart.VISUAL_ID));
- assertNotNull(compartment6);
-
- createNodeByTool(myClassTool, 201, 150);
-
- IGraphicalEditPart editPart17 = compartment6.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassEditPart.VISUAL_ID));
- assertNotNull(editPart17);
- assertEquals("Class", getMetaclassName(editPart17));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPackageInPackage() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool7;
- tool7 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Package_2006")));
-
- createNodeByTool(tool7, 200, 100);
-
- IGraphicalEditPart editPart18 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Package3EditPart.VISUAL_ID));
- assertNotNull(editPart18);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment7 = editPart18.getChildBySemanticHint(UMLVisualIDRegistry.getType(PackagePackagesEditPart.VISUAL_ID));
- assertNotNull(compartment7);
-
- createNodeByTool(myPackageTool, 201, 101);
-
- IGraphicalEditPart editPart19 = compartment7.getChildBySemanticHint(UMLVisualIDRegistry.getType(Package4EditPart.VISUAL_ID));
- assertNotNull(editPart19);
- assertEquals("Package", getMetaclassName(editPart19));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testClassInPackage() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool8;
- tool8 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Package_2006")));
-
- createNodeByTool(tool8, 200, 100);
-
- IGraphicalEditPart editPart20 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Package3EditPart.VISUAL_ID));
- assertNotNull(editPart20);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment8 = editPart20.getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageClassifiersEditPart.VISUAL_ID));
- assertNotNull(compartment8);
-
- createNodeByTool(myClassTool, 201, 101);
-
- IGraphicalEditPart editPart21 = compartment8.getChildBySemanticHint(UMLVisualIDRegistry.getType(Class3EditPart.VISUAL_ID));
- assertNotNull(editPart21);
- assertEquals("Class", getMetaclassName(editPart21));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testClassInClass() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool9;
- tool9 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.component.Class_2007")));
-
- createNodeByTool(tool9, 200, 100);
-
- IGraphicalEditPart editPart22 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassDiagramNotationClassEditPart.VISUAL_ID));
- assertNotNull(editPart22);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment9 = editPart22.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassClassesEditPart.VISUAL_ID));
- assertNotNull(compartment9);
-
- createNodeByTool(myClassTool, 201, 101);
-
- IGraphicalEditPart editPart23 = compartment9.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassDiagramNotationInnerClassEditPart.VISUAL_ID));
- assertNotNull(editPart23);
- assertEquals("Class", getMetaclassName(editPart23));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
-
- private static java.lang.String getMetaclassName(IGraphicalEditPart editPart) {
- return editPart.getNotationView().getElement().eClass().getName();
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/whole/TestWholeComponentDiagram.java b/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/whole/TestWholeComponentDiagram.java
deleted file mode 100644
index d090ae2..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/whole/TestWholeComponentDiagram.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.uml2.diagram.component.tests.whole;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collections;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.uml2.diagram.common.wholediagram.TestWholeDiagram;
-import org.eclipse.uml2.diagram.common.wholediagram.UMLInitDiagramFacade;
-import org.eclipse.uml2.diagram.component.edit.parts.Package2EditPart;
-import org.eclipse.uml2.diagram.component.edit.parts.PackageEditPart;
-import org.eclipse.uml2.diagram.component.part.UMLDiagramEditor;
-import org.eclipse.uml2.diagram.component.part.UMLDiagramEditorPlugin;
-import org.osgi.framework.Bundle;
-
-public class TestWholeComponentDiagram extends TestWholeDiagram {
-
- public TestWholeComponentDiagram(String modelFileName, String diagramFileName) {
- super(modelFileName, diagramFileName);
- }
-
- @Override
- protected UMLInitDiagramFacade getInitDiagramFacade(IFile modelFile, IFile diagramFile) {
- return new UMLInitDiagramFacade(modelFile, diagramFile, UMLDiagramEditor.ID) {
-
- @Override
- protected Diagram createDiagramView(EObject modelRoot) {
- return ViewService.createDiagram(modelRoot, PackageEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
- }
-
- @Override
- public Diagram getDiagramView() throws ExecutionException, IOException, CoreException {
- Diagram result = super.getDiagramView();
-// diagram should be refresh when link to link exists.
- UMLInitDiagramFacade.refreshDiagram(result);
- return result;
- }
-
- };
- }
-
- @Override
- protected URL findFileInTestPlugin(String fileName) {
- return FileLocator.find(UML_TEST_BUNDLE, new Path(EXAMPLE_FOLDER).append(fileName), Collections.EMPTY_MAP);
- }
-
- @Override
- protected boolean ignoreView(int visualId) {
- return super.ignoreView(visualId) || Package2EditPart.VISUAL_ID == visualId;
- }
-
- private final static Bundle UML_TEST_BUNDLE = Platform.getBundle("org.eclipse.uml2.diagram.component.tests");
-
- private final static String EXAMPLE_FOLDER = "examples/";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/whole/TestWholeDiagramSuite.java b/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/whole/TestWholeDiagramSuite.java
deleted file mode 100644
index d15479e..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/src/org/eclipse/uml2/diagram/component/tests/whole/TestWholeDiagramSuite.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.uml2.diagram.component.tests.whole;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.uml2.diagram.component.tests.ComponentDiagramFacade;
-
-import junit.framework.TestSuite;
-
-public class TestWholeDiagramSuite extends TestSuite {
-
- public TestWholeDiagramSuite() {
- for (String name : oursDiagramFiles) {
- addTest(new TestWholeComponentDiagram(name + ".uml", name + "." + ComponentDiagramFacade.DIAGRAM_FILE_EXTENSION));
- }
-
- }
-
- private static List<String> oursDiagramFiles = new ArrayList<String>();
- static {
- // Fig 8.14 has some question. It shows Assemply Connctor, which we don't support. Moreover, Connectors are duplicated in *.uml file.
- // Fig 8.14 needs more investigation.
-// oursDiagramFiles.add("8.14.Example of wiring through dependencies");
- oursDiagramFiles.add("8.16.Delegation connectors");
- oursDiagramFiles.add("8.6.Component with provided and required interfaces");
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.component.tests/test.xml b/tests/org.eclipse.uml2.diagram.component.tests/test.xml
deleted file mode 100644
index f0bf1b7..0000000
--- a/tests/org.eclipse.uml2.diagram.component.tests/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<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.uml2.diagram.component.tests"/>
- <property name="library-file" value="${eclipse-home}/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="uml2-tools-folder" value="${eclipse-home}/uml2_tools_folder"/>
- <delete dir="${uml2-tools-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${uml2-tools-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.uml2.diagram.component.tests.AllTests"/>
- <property name="vmargs" value="-ea -Xmx512M"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/.classpath b/tests/org.eclipse.uml2.diagram.csd.tests/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/.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/tests/org.eclipse.uml2.diagram.csd.tests/.project b/tests/org.eclipse.uml2.diagram.csd.tests/.project
deleted file mode 100644
index 7b4456e..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.csd.tests</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/tests/org.eclipse.uml2.diagram.csd.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.uml2.diagram.csd.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 68a58ca..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Apr 10 11:05:35 CEST 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/tests/org.eclipse.uml2.diagram.csd.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.diagram.csd.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 9711cba..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.csd.tests;singleton:=true
-Bundle-Version: 0.7.1.qualifier
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Require-Bundle: org.junit;bundle-version="3.8.2",
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.emf.ecore,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.notation,
- org.eclipse.gmf.runtime.common.ui,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.ui.ide;bundle-version="3.4.0",
- org.eclipse.uml2.diagram.common.tests;bundle-version="0.7.1",
- org.eclipse.uml2.diagram.csd;bundle-version="0.8.0"
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/about.html b/tests/org.eclipse.uml2.diagram.csd.tests/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/tests/org.eclipse.uml2.diagram.csd.tests/build.properties b/tests/org.eclipse.uml2.diagram.csd.tests/build.properties
deleted file mode 100644
index 524b8f9..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- examples/,\
- about.html,\
- src/,\
- plugin.xml,\
- test.xml,\
- plugin.properties
-src.includes = about.html,\
- test.xml
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml b/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml
deleted file mode 100644
index cc63bdd..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_y6tsAH1_EdyWXew6izX-PQ">
- <elementImport xmi:id="_y8f0sH1_EdyWXew6izX-PQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_y8f0sX1_EdyWXew6izX-PQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_y8f0sn1_EdyWXew6izX-PQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_y8f0s31_EdyWXew6izX-PQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Collaboration" xmi:id="_0GXm0H1_EdyWXew6izX-PQ" name="Observer" collaborationRole="_6_roAH1_EdyWXew6izX-PQ _7GEj4H1_EdyWXew6izX-PQ">
- <ownedAttribute xmi:id="_6_roAH1_EdyWXew6izX-PQ" name="Subject" type="_QKomAH2EEdyr-MCpgrIrqw"/>
- <ownedAttribute xmi:id="_7GEj4H1_EdyWXew6izX-PQ" name="Observer" type="_WYi5wH2EEdyr-MCpgrIrqw"/>
- <ownedConnector xmi:id="_XwAmgH2FEdyTpqaR0PW8XQ">
- <end xmi:id="_XwKXgH2FEdyTpqaR0PW8XQ" role="_6_roAH1_EdyWXew6izX-PQ"/>
- <end xmi:id="_XwKXgX2FEdyTpqaR0PW8XQ" role="_7GEj4H1_EdyWXew6izX-PQ"/>
- </ownedConnector>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_QKomAH2EEdyr-MCpgrIrqw" name="CallQueue"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_WYi5wH2EEdyr-MCpgrIrqw" name="SlidingBarIcon"/>
- <packagedElement xmi:type="uml:Constraint" xmi:id="_eUpRMI7pEdyDstIgzrrLww" name="Observer.reading = length (Subject.queue)
capacity: Integer
Observer.range = (0 .. Subject.capacity)" constrainedElement="_XwAmgH2FEdyTpqaR0PW8XQ">
- <specification xmi:type="uml:LiteralString" xmi:id="_eVPuII7pEdyDstIgzrrLww" value="ValueSpecification"/>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.umlcompositestructures_diagram b/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.umlcompositestructures_diagram
deleted file mode 100644
index e13153b..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.umlcompositestructures_diagram
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_y8f0tH1_EdyWXew6izX-PQ" type="UMLCompositeStructures" name="Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.umlcompositestructures_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_0G0SwH1_EdyWXew6izX-PQ" type="2005">
- <children xmi:type="notation:Node" xmi:id="_0G0SxH1_EdyWXew6izX-PQ" type="5009"/>
- <children xmi:type="notation:Node" xmi:id="_0G0SxX1_EdyWXew6izX-PQ" type="7003">
- <children xmi:type="notation:Node" xmi:id="_6_roAX1_EdyWXew6izX-PQ" type="3007">
- <children xmi:type="notation:Node" xmi:id="_6_roBH1_EdyWXew6izX-PQ" type="5011"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_6_roAn1_EdyWXew6izX-PQ"/>
- <element xmi:type="uml:Property" href="Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml#_6_roAH1_EdyWXew6izX-PQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6_roA31_EdyWXew6izX-PQ" x="42" y="21" width="133"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_7GEj4X1_EdyWXew6izX-PQ" type="3007">
- <children xmi:type="notation:Node" xmi:id="_7GEj5H1_EdyWXew6izX-PQ" type="5011"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_7GEj4n1_EdyWXew6izX-PQ"/>
- <element xmi:type="uml:Property" href="Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml#_7GEj4H1_EdyWXew6izX-PQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7GEj431_EdyWXew6izX-PQ" x="220" y="21" width="181"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_0G0Sxn1_EdyWXew6izX-PQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_0G0Sx31_EdyWXew6izX-PQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_0G0SwX1_EdyWXew6izX-PQ"/>
- <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_0G0Swn1_EdyWXew6izX-PQ"/>
- <element xmi:type="uml:Collaboration" href="Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml#_0GXm0H1_EdyWXew6izX-PQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0G0Sw31_EdyWXew6izX-PQ" x="96" y="84" width="639" height="287"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_QMausH2EEdyr-MCpgrIrqw" type="2006">
- <children xmi:type="notation:Node" xmi:id="_QMaus32EEdyr-MCpgrIrqw" type="5013"/>
- <children xmi:type="notation:Node" xmi:id="_QMkfsH2EEdyr-MCpgrIrqw" type="5014"/>
- <children xmi:type="notation:Node" xmi:id="_QMkfsX2EEdyr-MCpgrIrqw" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_QMkfsn2EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_QMkfs32EEdyr-MCpgrIrqw" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_QMkftH2EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_QMkftX2EEdyr-MCpgrIrqw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_QMkftn2EEdyr-MCpgrIrqw" type="7005">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_QMkft32EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_QMkfuH2EEdyr-MCpgrIrqw" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_QMkfuX2EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_QMkfun2EEdyr-MCpgrIrqw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_QMkfu32EEdyr-MCpgrIrqw" type="7006">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_QMkfvH2EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_QMkfvX2EEdyr-MCpgrIrqw" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_QMkfvn2EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_QMkfv32EEdyr-MCpgrIrqw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_QMausX2EEdyr-MCpgrIrqw"/>
- <element xmi:type="uml:Class" href="Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml#_QKomAH2EEdyr-MCpgrIrqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QMausn2EEdyr-MCpgrIrqw" x="876" y="132"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_WZIvoH2EEdyr-MCpgrIrqw" type="2006">
- <children xmi:type="notation:Node" xmi:id="_WZIvo32EEdyr-MCpgrIrqw" type="5013"/>
- <children xmi:type="notation:Node" xmi:id="_WZIvpH2EEdyr-MCpgrIrqw" type="5014"/>
- <children xmi:type="notation:Node" xmi:id="_WZIvpX2EEdyr-MCpgrIrqw" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_WZIvpn2EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_WZIvp32EEdyr-MCpgrIrqw" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_WZIvqH2EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_WZIvqX2EEdyr-MCpgrIrqw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_WZIvqn2EEdyr-MCpgrIrqw" type="7005">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_WZIvq32EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_WZIvrH2EEdyr-MCpgrIrqw" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_WZIvrX2EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_WZIvrn2EEdyr-MCpgrIrqw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_WZIvr32EEdyr-MCpgrIrqw" type="7006">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_WZIvsH2EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_WZIvsX2EEdyr-MCpgrIrqw" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_WZIvsn2EEdyr-MCpgrIrqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_WZIvs32EEdyr-MCpgrIrqw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_WZIvoX2EEdyr-MCpgrIrqw"/>
- <element xmi:type="uml:Class" href="Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml#_WYi5wH2EEdyr-MCpgrIrqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WZIvon2EEdyr-MCpgrIrqw" x="876" y="276"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_dTn5EI7pEdyDstIgzrrLww" type="2003">
- <children xmi:type="notation:Node" xmi:id="_dTn5E47pEdyDstIgzrrLww" type="5006"/>
- <children xmi:type="notation:Node" xmi:id="_dTn5FI7pEdyDstIgzrrLww" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_dTn5FY7pEdyDstIgzrrLww"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_dTn5Fo7pEdyDstIgzrrLww"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_dTn5F47pEdyDstIgzrrLww"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_dTn5EY7pEdyDstIgzrrLww"/>
- <element xmi:type="uml:Package" href="Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml#_y6tsAH1_EdyWXew6izX-PQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dTn5Eo7pEdyDstIgzrrLww"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_eV2LEI7pEdyDstIgzrrLww" type="2012">
- <children xmi:type="notation:Node" xmi:id="_eV2LE47pEdyDstIgzrrLww" type="5024"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_eV2LEY7pEdyDstIgzrrLww"/>
- <element xmi:type="uml:Constraint" href="Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml#_eUpRMI7pEdyDstIgzrrLww"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eV2LEo7pEdyDstIgzrrLww" x="48" y="408"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_y8f0tX1_EdyWXew6izX-PQ"/>
- <element xmi:type="uml:Package" href="Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml#_y6tsAH1_EdyWXew6izX-PQ"/>
- <edges xmi:type="notation:Edge" xmi:id="_dUElAI7pEdyDstIgzrrLww" type="4005" source="_7GEj4X1_EdyWXew6izX-PQ" target="_6_roAX1_EdyWXew6izX-PQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_dUElAY7pEdyDstIgzrrLww"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_dUElAo7pEdyDstIgzrrLww"/>
- <element xmi:type="uml:Connector" href="Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon.uml#_XwAmgH2FEdyTpqaR0PW8XQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dUElA47pEdyDstIgzrrLww" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_fj2PQI7pEdyDstIgzrrLww" type="4012" source="_eV2LEI7pEdyDstIgzrrLww" target="_dUElAI7pEdyDstIgzrrLww">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_fj2PQY7pEdyDstIgzrrLww"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_fj2PQo7pEdyDstIgzrrLww"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fj2PQ47pEdyDstIgzrrLww" points="[-8, -48, 43, 252]$[-50, -300, 1, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fj2PRI7pEdyDstIgzrrLww" id="(0.404,0.8)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fj2PRY7pEdyDstIgzrrLww" id="(0.5555556,0.4074074)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.14 - The BrokeredSale collaboration.uml b/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.14 - The BrokeredSale collaboration.uml
deleted file mode 100644
index e5fccb9..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.14 - The BrokeredSale collaboration.uml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_QAD-oH2NEdyTpqaR0PW8XQ">
- <elementImport xmi:id="_QB2HUH2NEdyTpqaR0PW8XQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_QB2HUX2NEdyTpqaR0PW8XQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_QB2HUn2NEdyTpqaR0PW8XQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_QB2HU32NEdyTpqaR0PW8XQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Collaboration" xmi:id="_Q3ze8H2NEdyTpqaR0PW8XQ" name="Sale" collaborationRole="_TXTAMH2NEdyTpqaR0PW8XQ _T57MIH2NEdyTpqaR0PW8XQ">
- <ownedAttribute xmi:id="_TXTAMH2NEdyTpqaR0PW8XQ" name="buyer"/>
- <ownedAttribute xmi:id="_T57MIH2NEdyTpqaR0PW8XQ" name="seller"/>
- <ownedConnector xmi:id="_XzyZoH2NEdyTpqaR0PW8XQ">
- <end xmi:id="_XzyZoX2NEdyTpqaR0PW8XQ" role="_TXTAMH2NEdyTpqaR0PW8XQ"/>
- <end xmi:id="_XzyZon2NEdyTpqaR0PW8XQ" role="_T57MIH2NEdyTpqaR0PW8XQ"/>
- </ownedConnector>
- </packagedElement>
- <packagedElement xmi:type="uml:Collaboration" xmi:id="_RK-SkH2NEdyTpqaR0PW8XQ" name="BrokeredSale" collaborationRole="_zPXlAH2NEdyTpqaR0PW8XQ _776-EH2QEdy7_vv-66ckTQ _86pQIH2QEdy7_vv-66ckTQ">
- <collaborationUse xmi:id="_1bihoH2NEdyTpqaR0PW8XQ" name="wholesale" clientDependency="_OV4_AH2REdy7_vv-66ckTQ _Sqp_0H2REdy7_vv-66ckTQ" type="_Q3ze8H2NEdyTpqaR0PW8XQ">
- <roleBinding xmi:id="_OV4_AH2REdy7_vv-66ckTQ" name="buyer" supplier="_zPXlAH2NEdyTpqaR0PW8XQ" client="_1bihoH2NEdyTpqaR0PW8XQ"/>
- <roleBinding xmi:id="_Sqp_0H2REdy7_vv-66ckTQ" name="seller" supplier="_86pQIH2QEdy7_vv-66ckTQ" client="_1bihoH2NEdyTpqaR0PW8XQ"/>
- </collaborationUse>
- <collaborationUse xmi:id="_DvMtIH2REdy7_vv-66ckTQ" name="retail" clientDependency="_QYZpUH2REdy7_vv-66ckTQ _Tt17IH2REdy7_vv-66ckTQ" type="_Q3ze8H2NEdyTpqaR0PW8XQ">
- <roleBinding xmi:id="_QYZpUH2REdy7_vv-66ckTQ" name="selller" supplier="_zPXlAH2NEdyTpqaR0PW8XQ" client="_DvMtIH2REdy7_vv-66ckTQ"/>
- <roleBinding xmi:id="_Tt17IH2REdy7_vv-66ckTQ" name="buyer" supplier="_776-EH2QEdy7_vv-66ckTQ" client="_DvMtIH2REdy7_vv-66ckTQ"/>
- </collaborationUse>
- <ownedAttribute xmi:id="_zPXlAH2NEdyTpqaR0PW8XQ" name="broker"/>
- <ownedAttribute xmi:id="_776-EH2QEdy7_vv-66ckTQ" name="consumer"/>
- <ownedAttribute xmi:id="_86pQIH2QEdy7_vv-66ckTQ" name="producer"/>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.14 - The BrokeredSale collaboration.umlcompositestructures_diagram b/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.14 - The BrokeredSale collaboration.umlcompositestructures_diagram
deleted file mode 100644
index 93d5675..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.14 - The BrokeredSale collaboration.umlcompositestructures_diagram
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_QB2HVH2NEdyTpqaR0PW8XQ" type="UMLCompositeStructures" name="Figure 9.14 - The BrokeredSale collaboration.umlcompositestructures_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_Q5uxkH2NEdyTpqaR0PW8XQ" type="2005">
- <children xmi:type="notation:Node" xmi:id="_Q5uxlH2NEdyTpqaR0PW8XQ" type="5009"/>
- <children xmi:type="notation:Node" xmi:id="_Q5uxlX2NEdyTpqaR0PW8XQ" type="7003">
- <children xmi:type="notation:Node" xmi:id="_TXcKIH2NEdyTpqaR0PW8XQ" type="3007">
- <children xmi:type="notation:Node" xmi:id="_TXcKI32NEdyTpqaR0PW8XQ" type="5011"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_TXcKIX2NEdyTpqaR0PW8XQ"/>
- <element xmi:type="uml:Property" href="Figure 9.14 - The BrokeredSale collaboration.uml#_TXTAMH2NEdyTpqaR0PW8XQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TXcKIn2NEdyTpqaR0PW8XQ" x="35" y="23" width="85"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_T6E9IH2NEdyTpqaR0PW8XQ" type="3007">
- <children xmi:type="notation:Node" xmi:id="_T6E9I32NEdyTpqaR0PW8XQ" type="5011"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_T6E9IX2NEdyTpqaR0PW8XQ"/>
- <element xmi:type="uml:Property" href="Figure 9.14 - The BrokeredSale collaboration.uml#_T57MIH2NEdyTpqaR0PW8XQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T6E9In2NEdyTpqaR0PW8XQ" x="227" y="23" width="116"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Q5uxln2NEdyTpqaR0PW8XQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Q5uxl32NEdyTpqaR0PW8XQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Q5uxkX2NEdyTpqaR0PW8XQ"/>
- <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_Q5uxkn2NEdyTpqaR0PW8XQ"/>
- <element xmi:type="uml:Collaboration" href="Figure 9.14 - The BrokeredSale collaboration.uml#_Q3ze8H2NEdyTpqaR0PW8XQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Q5uxk32NEdyTpqaR0PW8XQ" x="252" y="48" width="565" height="205"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_RK-SkX2NEdyTpqaR0PW8XQ" type="2005">
- <children xmi:type="notation:Node" xmi:id="_RK-SlX2NEdyTpqaR0PW8XQ" type="5009"/>
- <children xmi:type="notation:Node" xmi:id="_RK-Sln2NEdyTpqaR0PW8XQ" type="7003">
- <children xmi:type="notation:Node" xmi:id="_zPXlAX2NEdyTpqaR0PW8XQ" type="3007">
- <children xmi:type="notation:Node" xmi:id="_zPXlBH2NEdyTpqaR0PW8XQ" type="5011"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zPXlAn2NEdyTpqaR0PW8XQ"/>
- <element xmi:type="uml:Property" href="Figure 9.14 - The BrokeredSale collaboration.uml#_zPXlAH2NEdyTpqaR0PW8XQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zPXlA32NEdyTpqaR0PW8XQ" x="18" y="118" width="97"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_xAH-4H2QEdy7_vv-66ckTQ" type="3002">
- <children xmi:type="notation:Node" xmi:id="_xAH-432QEdy7_vv-66ckTQ" type="5002"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_xAH-4X2QEdy7_vv-66ckTQ"/>
- <element xmi:type="uml:CollaborationUse" href="Figure 9.14 - The BrokeredSale collaboration.uml#_1bihoH2NEdyTpqaR0PW8XQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xAH-4n2QEdy7_vv-66ckTQ" x="203" y="25" width="155" height="72"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_78EvEH2QEdy7_vv-66ckTQ" type="3007">
- <children xmi:type="notation:Node" xmi:id="_78EvE32QEdy7_vv-66ckTQ" type="5011"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_78EvEX2QEdy7_vv-66ckTQ"/>
- <element xmi:type="uml:Property" href="Figure 9.14 - The BrokeredSale collaboration.uml#_776-EH2QEdy7_vv-66ckTQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_78EvEn2QEdy7_vv-66ckTQ" x="407" y="181" width="83"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_86zBIH2QEdy7_vv-66ckTQ" type="3007">
- <children xmi:type="notation:Node" xmi:id="_86zBI32QEdy7_vv-66ckTQ" type="5011"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_86zBIX2QEdy7_vv-66ckTQ"/>
- <element xmi:type="uml:Property" href="Figure 9.14 - The BrokeredSale collaboration.uml#_86pQIH2QEdy7_vv-66ckTQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_86zBIn2QEdy7_vv-66ckTQ" x="407" y="37" width="69"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_DwY_8H2REdy7_vv-66ckTQ" type="3002">
- <children xmi:type="notation:Node" xmi:id="_DwY_832REdy7_vv-66ckTQ" type="5002"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_DwY_8X2REdy7_vv-66ckTQ"/>
- <element xmi:type="uml:CollaborationUse" href="Figure 9.14 - The BrokeredSale collaboration.uml#_DvMtIH2REdy7_vv-66ckTQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DwY_8n2REdy7_vv-66ckTQ" x="212" y="185" width="106" height="42"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_RK-Sl32NEdyTpqaR0PW8XQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_RK-SmH2NEdyTpqaR0PW8XQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_RK-Skn2NEdyTpqaR0PW8XQ"/>
- <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_RK-Sk32NEdyTpqaR0PW8XQ"/>
- <element xmi:type="uml:Collaboration" href="Figure 9.14 - The BrokeredSale collaboration.uml#_RK-SkH2NEdyTpqaR0PW8XQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RK-SlH2NEdyTpqaR0PW8XQ" x="36" y="300" width="889" height="433"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_QB2HVX2NEdyTpqaR0PW8XQ"/>
- <element xmi:type="uml:Package" href="Figure 9.14 - The BrokeredSale collaboration.uml#_QAD-oH2NEdyTpqaR0PW8XQ"/>
- <edges xmi:type="notation:Edge" xmi:id="_xBBWwH2QEdy7_vv-66ckTQ" type="4005" source="_T6E9IH2NEdyTpqaR0PW8XQ" target="_TXcKIH2NEdyTpqaR0PW8XQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_xBBWwX2QEdy7_vv-66ckTQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_xBBWwn2QEdy7_vv-66ckTQ"/>
- <element xmi:type="uml:Connector" href="Figure 9.14 - The BrokeredSale collaboration.uml#_XzyZoH2NEdyTpqaR0PW8XQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xBBWw32QEdy7_vv-66ckTQ" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_OV4_AX2REdy7_vv-66ckTQ" type="4006" source="_xAH-4H2QEdy7_vv-66ckTQ" target="_zPXlAX2NEdyTpqaR0PW8XQ">
- <children xmi:type="notation:Node" xmi:id="_OV4_BX2REdy7_vv-66ckTQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_OV4_Bn2REdy7_vv-66ckTQ" y="40"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_OV4_An2REdy7_vv-66ckTQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_OV4_A32REdy7_vv-66ckTQ"/>
- <element xmi:type="uml:Dependency" href="Figure 9.14 - The BrokeredSale collaboration.uml#_OV4_AH2REdy7_vv-66ckTQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OV4_BH2REdy7_vv-66ckTQ" points="[-40, 23, 96, -63]$[-138, 66, -2, -20]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_QYizQH2REdy7_vv-66ckTQ" type="4006" source="_DwY_8H2REdy7_vv-66ckTQ" target="_zPXlAX2NEdyTpqaR0PW8XQ">
- <children xmi:type="notation:Node" xmi:id="_QYizRH2REdy7_vv-66ckTQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QYizRX2REdy7_vv-66ckTQ" y="40"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_QYizQX2REdy7_vv-66ckTQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_QYizQn2REdy7_vv-66ckTQ"/>
- <element xmi:type="uml:Dependency" href="Figure 9.14 - The BrokeredSale collaboration.uml#_QYZpUH2REdy7_vv-66ckTQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QYizQ32REdy7_vv-66ckTQ" points="[-36, -30, 67, 65]$[-107, -75, -4, 20]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Sqp_0X2REdy7_vv-66ckTQ" type="4006" source="_xAH-4H2QEdy7_vv-66ckTQ" target="_86zBIH2QEdy7_vv-66ckTQ">
- <children xmi:type="notation:Node" xmi:id="_Sqp_1X2REdy7_vv-66ckTQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Sqp_1n2REdy7_vv-66ckTQ" x="-47" y="52"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_Sqp_0n2REdy7_vv-66ckTQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Sqp_032REdy7_vv-66ckTQ"/>
- <element xmi:type="uml:Dependency" href="Figure 9.14 - The BrokeredSale collaboration.uml#_Sqp_0H2REdy7_vv-66ckTQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Sqp_1H2REdy7_vv-66ckTQ" points="[40, -2, -153, 10]$[209, -14, 16, -2]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Sqzw0H2REdy7_vv-66ckTQ" id="(0.76811594,0.45)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Tt17IX2REdy7_vv-66ckTQ" type="4006" source="_DwY_8H2REdy7_vv-66ckTQ" target="_78EvEH2QEdy7_vv-66ckTQ">
- <children xmi:type="notation:Node" xmi:id="_Tt17JX2REdy7_vv-66ckTQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Tt17Jn2REdy7_vv-66ckTQ" y="40"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_Tt17In2REdy7_vv-66ckTQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Tt17I32REdy7_vv-66ckTQ"/>
- <element xmi:type="uml:Dependency" href="Figure 9.14 - The BrokeredSale collaboration.uml#_Tt17IH2REdy7_vv-66ckTQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Tt17JH2REdy7_vv-66ckTQ" points="[40, 3, -126, -10]$[125, 12, -41, -1]"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.16 - Port notation.uml b/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.16 - Port notation.uml
deleted file mode 100644
index fd093aa..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.16 - Port notation.uml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_UYxTsIijEdyRwMgm0d0rMg">
- <elementImport xmi:id="_Ua2-YIijEdyRwMgm0d0rMg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_Ua2-YYijEdyRwMgm0d0rMg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_Ua2-YoijEdyRwMgm0d0rMg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_Ua2-Y4ijEdyRwMgm0d0rMg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Class" xmi:id="_aZCNAIijEdyRwMgm0d0rMg" name="Engine">
- <ownedAttribute xmi:type="uml:Port" xmi:id="_gMy7YIijEdyRwMgm0d0rMg" name="p" clientDependency="_tXFr0Ik6EdyEAaxk3rxXCA" type="_bhg4AIijEdyRwMgm0d0rMg" aggregation="composite"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Interface" xmi:id="_bhg4AIijEdyRwMgm0d0rMg" name="powertrain"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="_bpiyoIijEdyRwMgm0d0rMg" name="power"/>
- <packagedElement xmi:type="uml:Usage" xmi:id="_tXFr0Ik6EdyEAaxk3rxXCA" supplier="_bpiyoIijEdyRwMgm0d0rMg" client="_gMy7YIijEdyRwMgm0d0rMg"/>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.16 - Port notation.umlcompositestructures_diagram b/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.16 - Port notation.umlcompositestructures_diagram
deleted file mode 100644
index 89cc639..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.16 - Port notation.umlcompositestructures_diagram
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_Ua2-ZIijEdyRwMgm0d0rMg" type="UMLCompositeStructures" name="Figure 9.16 - Port notation.umlcompositestructures_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_Uxn4kIijEdyRwMgm0d0rMg" type="2003">
- <children xmi:type="notation:Node" xmi:id="_UxxpkIijEdyRwMgm0d0rMg" type="5006"/>
- <children xmi:type="notation:Node" xmi:id="_UxxpkYijEdyRwMgm0d0rMg" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_UxxpkoijEdyRwMgm0d0rMg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Uxxpk4ijEdyRwMgm0d0rMg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_UxxplIijEdyRwMgm0d0rMg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Uxn4kYijEdyRwMgm0d0rMg"/>
- <element xmi:type="uml:Package" href="Figure 9.16 - Port notation.uml#_UYxTsIijEdyRwMgm0d0rMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Uxn4koijEdyRwMgm0d0rMg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_aZL-AIijEdyRwMgm0d0rMg" type="2006">
- <children xmi:type="notation:Node" xmi:id="_aZVH8IijEdyRwMgm0d0rMg" type="5013"/>
- <children xmi:type="notation:Node" xmi:id="_aZe48IijEdyRwMgm0d0rMg" type="5014"/>
- <children xmi:type="notation:Node" xmi:id="_aZe48YijEdyRwMgm0d0rMg" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_aZe48oijEdyRwMgm0d0rMg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_aZe484ijEdyRwMgm0d0rMg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_aZe49IijEdyRwMgm0d0rMg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_aZe49YijEdyRwMgm0d0rMg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_aZe49oijEdyRwMgm0d0rMg" type="7005">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_aZe494ijEdyRwMgm0d0rMg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_aZe4-IijEdyRwMgm0d0rMg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_aZe4-YijEdyRwMgm0d0rMg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_aZe4-oijEdyRwMgm0d0rMg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_aZe4-4ijEdyRwMgm0d0rMg" type="7006">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_aZe4_IijEdyRwMgm0d0rMg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_aZe4_YijEdyRwMgm0d0rMg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_aZe4_oijEdyRwMgm0d0rMg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_aZe4_4ijEdyRwMgm0d0rMg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_gNiiQIijEdyRwMgm0d0rMg" type="3011">
- <children xmi:type="notation:Node" xmi:id="_gNiiQ4ijEdyRwMgm0d0rMg" type="5012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_gNiiRIijEdyRwMgm0d0rMg" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_gNiiQYijEdyRwMgm0d0rMg"/>
- <element xmi:type="uml:Port" href="Figure 9.16 - Port notation.uml#_gMy7YIijEdyRwMgm0d0rMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gNiiQoijEdyRwMgm0d0rMg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_aZL-AYijEdyRwMgm0d0rMg"/>
- <element xmi:type="uml:Class" href="Figure 9.16 - Port notation.uml#_aZCNAIijEdyRwMgm0d0rMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aZL-AoijEdyRwMgm0d0rMg" x="240" y="216"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_biGt4IijEdyRwMgm0d0rMg" type="2009">
- <children xmi:type="notation:Node" xmi:id="_biGt44ijEdyRwMgm0d0rMg" type="5020">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_biGt5IijEdyRwMgm0d0rMg" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_biGt4YijEdyRwMgm0d0rMg"/>
- <element xmi:type="uml:Interface" href="Figure 9.16 - Port notation.uml#_bhg4AIijEdyRwMgm0d0rMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_biGt4oijEdyRwMgm0d0rMg" x="120" y="192"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_bpsjoIijEdyRwMgm0d0rMg" type="2009">
- <children xmi:type="notation:Node" xmi:id="_bpsjo4ijEdyRwMgm0d0rMg" type="5020">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_bpsjpIijEdyRwMgm0d0rMg" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_bpsjoYijEdyRwMgm0d0rMg"/>
- <element xmi:type="uml:Interface" href="Figure 9.16 - Port notation.uml#_bpiyoIijEdyRwMgm0d0rMg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bpsjooijEdyRwMgm0d0rMg" x="120" y="324"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_Ua2-ZYijEdyRwMgm0d0rMg"/>
- <element xmi:type="uml:Package" href="Figure 9.16 - Port notation.uml#_UYxTsIijEdyRwMgm0d0rMg"/>
- <edges xmi:type="notation:Edge" xmi:id="_qzLkoIk6EdyEAaxk3rxXCA" type="4010" source="_gNiiQIijEdyRwMgm0d0rMg" target="_biGt4IijEdyRwMgm0d0rMg">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_qzLkoYk6EdyEAaxk3rxXCA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_qzLkook6EdyEAaxk3rxXCA"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qzLko4k6EdyEAaxk3rxXCA" points="[-7, -3, 160, 66]$[-167, -61, 0, 8]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_tXrhsIk6EdyEAaxk3rxXCA" type="4008" source="_gNiiQIijEdyRwMgm0d0rMg" target="_bpsjoIijEdyRwMgm0d0rMg">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_tXrhsYk6EdyEAaxk3rxXCA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_tXrhsok6EdyEAaxk3rxXCA"/>
- <element xmi:type="uml:Usage" href="Figure 9.16 - Port notation.uml#_tXFr0Ik6EdyEAaxk3rxXCA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tXrhs4k6EdyEAaxk3rxXCA" points="[-7, 2, 164, -44]$[-178, 45, -7, -1]"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.19 - Port examples.uml b/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.19 - Port examples.uml
deleted file mode 100644
index 92f6833..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.19 - Port examples.uml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_fg8uQLrFEdyb4vWi0vlZeg">
- <elementImport xmi:id="_fjLi4LrFEdyb4vWi0vlZeg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_fjLi4brFEdyb4vWi0vlZeg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_fjLi4rrFEdyb4vWi0vlZeg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_fjLi47rFEdyb4vWi0vlZeg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Class" xmi:id="_pifEoLrFEdyb4vWi0vlZeg" name="Car">
- <ownedAttribute xmi:id="_rJb0ULrFEdyb4vWi0vlZeg" name="rear" type="_6R1r8LrHEdyb4vWi0vlZeg"/>
- <ownedAttribute xmi:id="_sORVcLrFEdyb4vWi0vlZeg" name="e" type="_Oo8kcLrHEdyb4vWi0vlZeg"/>
- <ownedConnector xmi:id="_NFaVILrHEdyb4vWi0vlZeg" name="axle">
- <end xmi:id="_NFaVIbrHEdyb4vWi0vlZeg" role="_rJb0ULrFEdyb4vWi0vlZeg"/>
- <end xmi:id="_NFaVIrrHEdyb4vWi0vlZeg" partWithPort="_sORVcLrFEdyb4vWi0vlZeg" role="_WDiGsLrHEdyb4vWi0vlZeg"/>
- </ownedConnector>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_Oo8kcLrHEdyb4vWi0vlZeg" name="Engine">
- <ownedAttribute xmi:type="uml:Port" xmi:id="_WDiGsLrHEdyb4vWi0vlZeg" name="p" clientDependency="_dT7yMLrHEdyb4vWi0vlZeg" type="_Xhi80LrHEdyb4vWi0vlZeg" aggregation="composite"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Interface" xmi:id="_Xhi80LrHEdyb4vWi0vlZeg" name="powertrain"/>
- <packagedElement xmi:type="uml:Interface" xmi:id="_Xqe2YLrHEdyb4vWi0vlZeg" name="power"/>
- <packagedElement xmi:type="uml:Usage" xmi:id="_dT7yMLrHEdyb4vWi0vlZeg" supplier="_Xqe2YLrHEdyb4vWi0vlZeg" client="_WDiGsLrHEdyb4vWi0vlZeg"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_j6eoYLrHEdyb4vWi0vlZeg" name="Boat">
- <ownedAttribute xmi:id="_2lPeYLrHEdyb4vWi0vlZeg" name="pp" type="_7hjAULrHEdyb4vWi0vlZeg"/>
- <ownedAttribute xmi:id="_3V9wsLrHEdyb4vWi0vlZeg" name="e" type="_Oo8kcLrHEdyb4vWi0vlZeg"/>
- <ownedConnector xmi:id="_7fn4QLrIEdyb4vWi0vlZeg" name="shaft">
- <end xmi:id="_7fn4QbrIEdyb4vWi0vlZeg" partWithPort="_2lPeYLrHEdyb4vWi0vlZeg" role="_JGvAYMBqEdyow_O2MbsLDQ"/>
- <end xmi:id="_7fxpQLrIEdyb4vWi0vlZeg" partWithPort="_3V9wsLrHEdyb4vWi0vlZeg" role="_WDiGsLrHEdyb4vWi0vlZeg"/>
- </ownedConnector>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_6R1r8LrHEdyb4vWi0vlZeg" name="Wheel"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_7hjAULrHEdyb4vWi0vlZeg" name="Propeller">
- <ownedAttribute xmi:type="uml:Port" xmi:id="_JGvAYMBqEdyow_O2MbsLDQ" name="pp" aggregation="composite"/>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.19 - Port examples.umlcompositestructures_diagram b/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.19 - Port examples.umlcompositestructures_diagram
deleted file mode 100644
index 8ae45ba..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.19 - Port examples.umlcompositestructures_diagram
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_fj7JwLrFEdyb4vWi0vlZeg" type="UMLCompositeStructures" name="Figure 9.19 - Port examples.umlcompositestructures_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_f_ymYLrFEdyb4vWi0vlZeg" type="2003">
- <children xmi:type="notation:Node" xmi:id="_gAFhULrFEdyb4vWi0vlZeg" type="5006"/>
- <children xmi:type="notation:Node" xmi:id="_gAOrQLrFEdyb4vWi0vlZeg" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_gAOrQbrFEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_gAOrQrrFEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_gAOrQ7rFEdyb4vWi0vlZeg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_f_ymYbrFEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Package" href="Figure 9.19 - Port examples.uml#_fg8uQLrFEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f_ymYrrFEdyb4vWi0vlZeg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_OpZQYLrHEdyb4vWi0vlZeg" type="2006">
- <children xmi:type="notation:Node" xmi:id="_OpZQY7rHEdyb4vWi0vlZeg" type="5013"/>
- <children xmi:type="notation:Node" xmi:id="_OpZQZLrHEdyb4vWi0vlZeg" type="5014"/>
- <children xmi:type="notation:Node" xmi:id="_OpZQZbrHEdyb4vWi0vlZeg" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_OpZQZrrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_OpZQZ7rHEdyb4vWi0vlZeg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_OpZQaLrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_OpZQabrHEdyb4vWi0vlZeg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_OpZQarrHEdyb4vWi0vlZeg" type="7005">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_OpZQa7rHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_OpZQbLrHEdyb4vWi0vlZeg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_OpZQbbrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_OpZQbrrHEdyb4vWi0vlZeg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_OpZQb7rHEdyb4vWi0vlZeg" type="7006">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_OpZQcLrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_OpZQcbrHEdyb4vWi0vlZeg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_OpZQcrrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_OpZQc7rHEdyb4vWi0vlZeg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_WD-yoLrHEdyb4vWi0vlZeg" type="3011">
- <children xmi:type="notation:Node" xmi:id="_WERtkLrHEdyb4vWi0vlZeg" type="5012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_WERtkbrHEdyb4vWi0vlZeg" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_WD-yobrHEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Port" href="Figure 9.19 - Port examples.uml#_WDiGsLrHEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WD-yorrHEdyb4vWi0vlZeg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_OpZQYbrHEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Class" href="Figure 9.19 - Port examples.uml#_Oo8kcLrHEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OpZQYrrHEdyb4vWi0vlZeg" x="179" y="162"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Xh_owLrHEdyb4vWi0vlZeg" type="2009">
- <children xmi:type="notation:Node" xmi:id="_XicUsLrHEdyb4vWi0vlZeg" type="5020">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XicUsbrHEdyb4vWi0vlZeg" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Xh_owbrHEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Interface" href="Figure 9.19 - Port examples.uml#_Xhi80LrHEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xh_owrrHEdyb4vWi0vlZeg" x="60" y="172"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_XqyYYLrHEdyb4vWi0vlZeg" type="2009">
- <children xmi:type="notation:Node" xmi:id="_XqyYY7rHEdyb4vWi0vlZeg" type="5020">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XqyYZLrHEdyb4vWi0vlZeg" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_XqyYYbrHEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Interface" href="Figure 9.19 - Port examples.uml#_Xqe2YLrHEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XqyYYrrHEdyb4vWi0vlZeg" x="60" y="264"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_lVqM8LrHEdyb4vWi0vlZeg" type="2007">
- <children xmi:type="notation:Node" xmi:id="_lVqM87rHEdyb4vWi0vlZeg" type="5018"/>
- <children xmi:type="notation:Node" xmi:id="_lVqM9LrHEdyb4vWi0vlZeg" type="7007">
- <children xmi:type="notation:Node" xmi:id="_2lPeYbrHEdyb4vWi0vlZeg" type="3014">
- <children xmi:type="notation:Node" xmi:id="_2lPeZLrHEdyb4vWi0vlZeg" type="5017"/>
- <children xmi:type="notation:Node" xmi:id="_cJW8yMBqEdyow_O2MbsLDQ" type="3016">
- <children xmi:type="notation:Node" xmi:id="_cJW8y8BqEdyow_O2MbsLDQ" type="5025">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_cJW8zMBqEdyow_O2MbsLDQ" x="23" y="35"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_cJW8ycBqEdyow_O2MbsLDQ"/>
- <element xmi:type="uml:Port" href="Figure 9.19 - Port examples.uml#_JGvAYMBqEdyow_O2MbsLDQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cJW8ysBqEdyow_O2MbsLDQ" x="120" y="12"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_2lPeYrrHEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Property" href="Figure 9.19 - Port examples.uml#_2lPeYLrHEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2lPeY7rHEdyb4vWi0vlZeg" x="29" y="36" width="121"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_3WG6oLrHEdyb4vWi0vlZeg" type="3014">
- <children xmi:type="notation:Node" xmi:id="_3WG6o7rHEdyb4vWi0vlZeg" type="5017"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_3WG6obrHEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Property" href="Figure 9.19 - Port examples.uml#_3V9wsLrHEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3WG6orrHEdyb4vWi0vlZeg" x="245" y="24"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_lVqM9brHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_lVqM9rrHEdyb4vWi0vlZeg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_lVqM8brHEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Class" href="Figure 9.19 - Port examples.uml#_j6eoYLrHEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lVqM8rrHEdyb4vWi0vlZeg" x="408" y="384" width="397" height="157"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6SSX4LrHEdyb4vWi0vlZeg" type="2006">
- <children xmi:type="notation:Node" xmi:id="_6SSX47rHEdyb4vWi0vlZeg" type="5013"/>
- <children xmi:type="notation:Node" xmi:id="_6SSX5LrHEdyb4vWi0vlZeg" type="5014"/>
- <children xmi:type="notation:Node" xmi:id="_6SSX5brHEdyb4vWi0vlZeg" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_6SSX5rrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_6SSX57rHEdyb4vWi0vlZeg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_6SSX6LrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_6SSX6brHEdyb4vWi0vlZeg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6SSX6rrHEdyb4vWi0vlZeg" type="7005">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_6SSX67rHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_6SSX7LrHEdyb4vWi0vlZeg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_6SSX7brHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_6SSX7rrHEdyb4vWi0vlZeg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_6SSX77rHEdyb4vWi0vlZeg" type="7006">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_6SSX8LrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_6SSX8brHEdyb4vWi0vlZeg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_6SSX8rrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_6SSX87rHEdyb4vWi0vlZeg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_6SSX4brHEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Class" href="Figure 9.19 - Port examples.uml#_6R1r8LrHEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6SSX4rrHEdyb4vWi0vlZeg" x="36" y="372"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_7hjAUbrHEdyb4vWi0vlZeg" type="2006">
- <children xmi:type="notation:Node" xmi:id="_7hjAVLrHEdyb4vWi0vlZeg" type="5013"/>
- <children xmi:type="notation:Node" xmi:id="_7hjAVbrHEdyb4vWi0vlZeg" type="5014"/>
- <children xmi:type="notation:Node" xmi:id="_7hjAVrrHEdyb4vWi0vlZeg" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_7hjAV7rHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_7hjAWLrHEdyb4vWi0vlZeg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7hjAWbrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7hjAWrrHEdyb4vWi0vlZeg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_7hsxULrHEdyb4vWi0vlZeg" type="7005">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_7hsxUbrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_7hsxUrrHEdyb4vWi0vlZeg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7hsxU7rHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7hsxVLrHEdyb4vWi0vlZeg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_7hsxVbrHEdyb4vWi0vlZeg" type="7006">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_7hsxVrrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_7hsxV7rHEdyb4vWi0vlZeg" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7hsxWLrHEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7hsxWbrHEdyb4vWi0vlZeg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_JHLsUMBqEdyow_O2MbsLDQ" type="3011">
- <children xmi:type="notation:Node" xmi:id="_JHLsU8BqEdyow_O2MbsLDQ" type="5012">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JHLsVMBqEdyow_O2MbsLDQ" x="-20" y="35"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_JHLsUcBqEdyow_O2MbsLDQ"/>
- <element xmi:type="uml:Port" href="Figure 9.19 - Port examples.uml#_JGvAYMBqEdyow_O2MbsLDQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JHLsUsBqEdyow_O2MbsLDQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_7hjAUrrHEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Class" href="Figure 9.19 - Port examples.uml#_7hjAULrHEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7hjAU7rHEdyb4vWi0vlZeg" x="24" y="552"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_p8ankLrFEdyb4vWi0vlZeg" type="2007">
- <children xmi:type="notation:Node" xmi:id="_p8ank7rFEdyb4vWi0vlZeg" type="5018"/>
- <children xmi:type="notation:Node" xmi:id="_p8jxgLrFEdyb4vWi0vlZeg" type="7007">
- <children xmi:type="notation:Node" xmi:id="_rJllULrFEdyb4vWi0vlZeg" type="3014">
- <children xmi:type="notation:Node" xmi:id="_rKCRQLrFEdyb4vWi0vlZeg" type="5017"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_rJllUbrFEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Property" href="Figure 9.19 - Port examples.uml#_rJb0ULrFEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJllUrrFEdyb4vWi0vlZeg" x="9" y="7" width="97"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_sOafYLrFEdyb4vWi0vlZeg" type="3014">
- <children xmi:type="notation:Node" xmi:id="_sOafY7rFEdyb4vWi0vlZeg" type="5017"/>
- <children xmi:type="notation:Node" xmi:id="_nwIckL-vEdy70ta68irNJQ" type="3016">
- <children xmi:type="notation:Node" xmi:id="_nwIck7-vEdy70ta68irNJQ" type="5025">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_nwIclL-vEdy70ta68irNJQ" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_nwIckb-vEdy70ta68irNJQ"/>
- <element xmi:type="uml:Port" href="Figure 9.19 - Port examples.uml#_WDiGsLrHEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nwIckr-vEdy70ta68irNJQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_sOafYbrFEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Property" href="Figure 9.19 - Port examples.uml#_sORVcLrFEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sOafYrrFEdyb4vWi0vlZeg" x="237" y="7" width="116"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_p8jxgbrFEdyb4vWi0vlZeg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_p8jxgrrFEdyb4vWi0vlZeg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_p8ankbrFEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Class" href="Figure 9.19 - Port examples.uml#_pifEoLrFEdyb4vWi0vlZeg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_p8ankrrFEdyb4vWi0vlZeg" x="408" y="180" width="389"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_fj7JwbrFEdyb4vWi0vlZeg"/>
- <element xmi:type="uml:Package" href="Figure 9.19 - Port examples.uml#_fg8uQLrFEdyb4vWi0vlZeg"/>
- <edges xmi:type="notation:Edge" xmi:id="_n0eKAL-vEdy70ta68irNJQ" type="4008" source="_WD-yoLrHEdyb4vWi0vlZeg" target="_XqyYYLrHEdyb4vWi0vlZeg">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_n0eKAb-vEdy70ta68irNJQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_n0eKAr-vEdy70ta68irNJQ"/>
- <element xmi:type="uml:Usage" href="Figure 9.19 - Port examples.uml#_dT7yMLrHEdyb4vWi0vlZeg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n0eKA7-vEdy70ta68irNJQ" points="[-7, -7, 0, 0]$[-7, -7, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_n0n7AL-vEdy70ta68irNJQ" type="4010" source="_WD-yoLrHEdyb4vWi0vlZeg" target="_Xh_owLrHEdyb4vWi0vlZeg">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_n0n7Ab-vEdy70ta68irNJQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_n0n7Ar-vEdy70ta68irNJQ"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n0n7A7-vEdy70ta68irNJQ" points="[-7, -7, 0, 0]$[-7, -7, 0, 0]"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.20 - Properties.uml b/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.20 - Properties.uml
deleted file mode 100644
index 6037833..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.20 - Properties.uml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_A6XmgI7TEdyb7ozkoKU63Q">
- <elementImport xmi:id="_A8AlQI7TEdyb7ozkoKU63Q">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_A8AlQY7TEdyb7ozkoKU63Q">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_A8AlQo7TEdyb7ozkoKU63Q">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_A8AlQ47TEdyb7ozkoKU63Q">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Class" xmi:id="_B0AkQI7TEdyb7ozkoKU63Q" name="Wheel"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_B8M28I7TEdyb7ozkoKU63Q" name="Car"/>
- <packagedElement xmi:type="uml:Class" xmi:id="_CBQ9II7TEdyb7ozkoKU63Q" name="Engine"/>
- <packagedElement xmi:type="uml:Association" xmi:id="_LzY-gI7TEdyb7ozkoKU63Q" memberEnd="_LziIcI7TEdyb7ozkoKU63Q _LziIc47TEdyb7ozkoKU63Q">
- <ownedEnd xmi:id="_LziIcI7TEdyb7ozkoKU63Q" name="src" type="_B8M28I7TEdyb7ozkoKU63Q" association="_LzY-gI7TEdyb7ozkoKU63Q">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LziIco7TEdyb7ozkoKU63Q" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LziIcY7TEdyb7ozkoKU63Q" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_LziIc47TEdyb7ozkoKU63Q" name="dst" type="_CBQ9II7TEdyb7ozkoKU63Q" association="_LzY-gI7TEdyb7ozkoKU63Q">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LziIdY7TEdyb7ozkoKU63Q" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LziIdI7TEdyb7ozkoKU63Q" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_MwAXwI7TEdyb7ozkoKU63Q" name="Axle" memberEnd="_MwAXwY7TEdyb7ozkoKU63Q _MwJhso7TEdyb7ozkoKU63Q">
- <ownedEnd xmi:id="_MwAXwY7TEdyb7ozkoKU63Q" name="src" type="_B0AkQI7TEdyb7ozkoKU63Q" association="_MwAXwI7TEdyb7ozkoKU63Q">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MwJhsY7TEdyb7ozkoKU63Q" value="*"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MwJhsI7TEdyb7ozkoKU63Q"/>
- </ownedEnd>
- <ownedEnd xmi:id="_MwJhso7TEdyb7ozkoKU63Q" name="dst" type="_CBQ9II7TEdyb7ozkoKU63Q" association="_MwAXwI7TEdyb7ozkoKU63Q">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_MwJhtI7TEdyb7ozkoKU63Q" value="*"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_MwJhs47TEdyb7ozkoKU63Q"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_Oc4JQI7TEdyb7ozkoKU63Q" memberEnd="_Oc4JQY7TEdyb7ozkoKU63Q _Oc4JRI7TEdyb7ozkoKU63Q">
- <ownedEnd xmi:id="_Oc4JQY7TEdyb7ozkoKU63Q" name="src" type="_B8M28I7TEdyb7ozkoKU63Q" association="_Oc4JQI7TEdyb7ozkoKU63Q">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Oc4JQ47TEdyb7ozkoKU63Q" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Oc4JQo7TEdyb7ozkoKU63Q" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_Oc4JRI7TEdyb7ozkoKU63Q" name="rear" type="_B0AkQI7TEdyb7ozkoKU63Q" aggregation="composite" association="_Oc4JQI7TEdyb7ozkoKU63Q">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Oc4JRo7TEdyb7ozkoKU63Q" value="2"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Oc4JRY7TEdyb7ozkoKU63Q" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Class" xmi:id="_tC6jkJH2Edyt7sFQzxejuQ" name="Car">
- <ownedAttribute xmi:id="_vG1jIJH2Edyt7sFQzxejuQ" name="rear" type="_B0AkQI7TEdyb7ozkoKU63Q" aggregation="composite">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ko7H4JH4EdyLU8hXuWDsRQ" value="2"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_v7pEMJH2Edyt7sFQzxejuQ" name="e" type="_CBQ9II7TEdyb7ozkoKU63Q"/>
- <ownedConnector xmi:id="_MobYwJH3Edyt7sFQzxejuQ" name="a" type="_MwAXwI7TEdyb7ozkoKU63Q">
- <end xmi:id="_MobYwZH3Edyt7sFQzxejuQ" role="_vG1jIJH2Edyt7sFQzxejuQ"/>
- <end xmi:id="_MobYwpH3Edyt7sFQzxejuQ" role="_v7pEMJH2Edyt7sFQzxejuQ"/>
- </ownedConnector>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.20 - Properties.umlcompositestructures_diagram b/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.20 - Properties.umlcompositestructures_diagram
deleted file mode 100644
index 77ab627..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/examples/Figure 9.20 - Properties.umlcompositestructures_diagram
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_A8KWQI7TEdyb7ozkoKU63Q" type="UMLCompositeStructures" name="Figure 9.20 - Properties.umlcompositestructures_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_BQH0EI7TEdyb7ozkoKU63Q" type="2003">
- <children xmi:type="notation:Node" xmi:id="_BQH0E47TEdyb7ozkoKU63Q" type="5006"/>
- <children xmi:type="notation:Node" xmi:id="_BQH0FI7TEdyb7ozkoKU63Q" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_BQH0FY7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_BQH0Fo7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_BQH0F47TEdyb7ozkoKU63Q"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_BQH0EY7TEdyb7ozkoKU63Q"/>
- <element xmi:type="uml:Package" href="Figure 9.20 - Properties.uml#_A6XmgI7TEdyb7ozkoKU63Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BQH0Eo7TEdyb7ozkoKU63Q"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_B1WoEI7TEdyb7ozkoKU63Q" type="2006">
- <children xmi:type="notation:Node" xmi:id="_B1fyAI7TEdyb7ozkoKU63Q" type="5013"/>
- <children xmi:type="notation:Node" xmi:id="_B1fyAY7TEdyb7ozkoKU63Q" type="5014"/>
- <children xmi:type="notation:Node" xmi:id="_B1fyAo7TEdyb7ozkoKU63Q" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_B1fyA47TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_B1fyBI7TEdyb7ozkoKU63Q" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_B1fyBY7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_B1fyBo7TEdyb7ozkoKU63Q"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_B1fyB47TEdyb7ozkoKU63Q" type="7005">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_B1fyCI7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_B1fyCY7TEdyb7ozkoKU63Q" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_B1fyCo7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_B1fyC47TEdyb7ozkoKU63Q"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_B1fyDI7TEdyb7ozkoKU63Q" type="7006">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_B1fyDY7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_B1fyDo7TEdyb7ozkoKU63Q" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_B1fyD47TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_B1fyEI7TEdyb7ozkoKU63Q"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_B1WoEY7TEdyb7ozkoKU63Q"/>
- <element xmi:type="uml:Class" href="Figure 9.20 - Properties.uml#_B0AkQI7TEdyb7ozkoKU63Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B1WoEo7TEdyb7ozkoKU63Q" x="204" y="312"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_B8Wn8I7TEdyb7ozkoKU63Q" type="2006">
- <children xmi:type="notation:Node" xmi:id="_B8Wn847TEdyb7ozkoKU63Q" type="5013"/>
- <children xmi:type="notation:Node" xmi:id="_B8Wn9I7TEdyb7ozkoKU63Q" type="5014"/>
- <children xmi:type="notation:Node" xmi:id="_B8Wn9Y7TEdyb7ozkoKU63Q" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_B8Wn9o7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_B8Wn947TEdyb7ozkoKU63Q" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_B8Wn-I7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_B8Wn-Y7TEdyb7ozkoKU63Q"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_B8Wn-o7TEdyb7ozkoKU63Q" type="7005">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_B8Wn-47TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_B8Wn_I7TEdyb7ozkoKU63Q" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_B8Wn_Y7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_B8Wn_o7TEdyb7ozkoKU63Q"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_B8Wn_47TEdyb7ozkoKU63Q" type="7006">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_B8WoAI7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_B8WoAY7TEdyb7ozkoKU63Q" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_B8WoAo7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_B8WoA47TEdyb7ozkoKU63Q"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_B8Wn8Y7TEdyb7ozkoKU63Q"/>
- <element xmi:type="uml:Class" href="Figure 9.20 - Properties.uml#_B8M28I7TEdyb7ozkoKU63Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B8Wn8o7TEdyb7ozkoKU63Q" x="336" y="192" width="110" height="72"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_CBj4EI7TEdyb7ozkoKU63Q" type="2006">
- <children xmi:type="notation:Node" xmi:id="_CBj4E47TEdyb7ozkoKU63Q" type="5013"/>
- <children xmi:type="notation:Node" xmi:id="_CBj4FI7TEdyb7ozkoKU63Q" type="5014"/>
- <children xmi:type="notation:Node" xmi:id="_CBj4FY7TEdyb7ozkoKU63Q" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_CBj4Fo7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_CBj4F47TEdyb7ozkoKU63Q" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_CBj4GI7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CBj4GY7TEdyb7ozkoKU63Q"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_CBj4Go7TEdyb7ozkoKU63Q" type="7005">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_CBj4G47TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_CBj4HI7TEdyb7ozkoKU63Q" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_CBj4HY7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CBj4Ho7TEdyb7ozkoKU63Q"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_CBj4H47TEdyb7ozkoKU63Q" type="7006">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_CBj4II7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:TitleStyle" xmi:id="_CBj4IY7TEdyb7ozkoKU63Q" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_CBj4Io7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CBj4I47TEdyb7ozkoKU63Q"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_CBj4EY7TEdyb7ozkoKU63Q"/>
- <element xmi:type="uml:Class" href="Figure 9.20 - Properties.uml#_CBQ9II7TEdyb7ozkoKU63Q"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CBj4Eo7TEdyb7ozkoKU63Q" x="516" y="312"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_uKAugJH2Edyt7sFQzxejuQ" type="2007">
- <children xmi:type="notation:Node" xmi:id="_uKAug5H2Edyt7sFQzxejuQ" type="5018"/>
- <children xmi:type="notation:Node" xmi:id="_uKAuhJH2Edyt7sFQzxejuQ" type="7007">
- <children xmi:type="notation:Node" xmi:id="_vG1jIZH2Edyt7sFQzxejuQ" type="3014">
- <children xmi:type="notation:Node" xmi:id="_vG_UIJH2Edyt7sFQzxejuQ" type="5017"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_vG1jIpH2Edyt7sFQzxejuQ"/>
- <element xmi:type="uml:Property" href="Figure 9.20 - Properties.uml#_vG1jIJH2Edyt7sFQzxejuQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vG1jI5H2Edyt7sFQzxejuQ" x="29" y="24"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_v7pEMZH2Edyt7sFQzxejuQ" type="3014">
- <children xmi:type="notation:Node" xmi:id="_v7pENJH2Edyt7sFQzxejuQ" type="5017"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_v7pEMpH2Edyt7sFQzxejuQ"/>
- <element xmi:type="uml:Property" href="Figure 9.20 - Properties.uml#_v7pEMJH2Edyt7sFQzxejuQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_v7pEM5H2Edyt7sFQzxejuQ" x="185" y="24"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_uKAuhZH2Edyt7sFQzxejuQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_uKAuhpH2Edyt7sFQzxejuQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_uKAugZH2Edyt7sFQzxejuQ"/>
- <element xmi:type="uml:Class" href="Figure 9.20 - Properties.uml#_tC6jkJH2Edyt7sFQzxejuQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uKAugpH2Edyt7sFQzxejuQ" x="744" y="204" width="289" height="109"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_A8KWQY7TEdyb7ozkoKU63Q"/>
- <element xmi:type="uml:Package" href="Figure 9.20 - Properties.uml#_A6XmgI7TEdyb7ozkoKU63Q"/>
- <edges xmi:type="notation:Edge" xmi:id="_LziIdo7TEdyb7ozkoKU63Q" type="4011" source="_B8Wn8I7TEdyb7ozkoKU63Q" target="_CBj4EI7TEdyb7ozkoKU63Q">
- <children xmi:type="notation:Node" xmi:id="_Lzr5cI7TEdyb7ozkoKU63Q" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Lzr5cY7TEdyb7ozkoKU63Q" y="20"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Lzr5co7TEdyb7ozkoKU63Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Lzr5c47TEdyb7ozkoKU63Q" y="-15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Lzr5dI7TEdyb7ozkoKU63Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Lzr5dY7TEdyb7ozkoKU63Q" y="-15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Lzr5do7TEdyb7ozkoKU63Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Lzr5d47TEdyb7ozkoKU63Q" y="-30"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Lzr5eI7TEdyb7ozkoKU63Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Lzr5eY7TEdyb7ozkoKU63Q" y="-30"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Lzr5eo7TEdyb7ozkoKU63Q" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Lzr5e47TEdyb7ozkoKU63Q" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Lzr5fI7TEdyb7ozkoKU63Q" type="6008">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Lzr5fY7TEdyb7ozkoKU63Q" y="15"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_LziId47TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_LziIeI7TEdyb7ozkoKU63Q"/>
- <element xmi:type="uml:Association" href="Figure 9.20 - Properties.uml#_LzY-gI7TEdyb7ozkoKU63Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LziIeY7TEdyb7ozkoKU63Q" points="[55, 44, -94, -93]$[199, 129, 50, -8]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_MwJhtY7TEdyb7ozkoKU63Q" type="4011" source="_B1WoEI7TEdyb7ozkoKU63Q" target="_CBj4EI7TEdyb7ozkoKU63Q">
- <children xmi:type="notation:Node" xmi:id="_MwJhuY7TEdyb7ozkoKU63Q" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_MwJhuo7TEdyb7ozkoKU63Q" y="20"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_MwJhu47TEdyb7ozkoKU63Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_MwJhvI7TEdyb7ozkoKU63Q" y="-15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_MwJhvY7TEdyb7ozkoKU63Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_MwJhvo7TEdyb7ozkoKU63Q" y="-15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_MwJhv47TEdyb7ozkoKU63Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_MwJhwI7TEdyb7ozkoKU63Q" y="-30"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_MwJhwY7TEdyb7ozkoKU63Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_MwJhwo7TEdyb7ozkoKU63Q" y="-30"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_MwJhw47TEdyb7ozkoKU63Q" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_MwJhxI7TEdyb7ozkoKU63Q" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_MwJhxY7TEdyb7ozkoKU63Q" type="6008">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_MwJhxo7TEdyb7ozkoKU63Q" y="15"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_MwJhto7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_MwJht47TEdyb7ozkoKU63Q"/>
- <element xmi:type="uml:Association" href="Figure 9.20 - Properties.uml#_MwAXwI7TEdyb7ozkoKU63Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MwJhuI7TEdyb7ozkoKU63Q" points="[50, 4, -243, 6]$[243, 4, -50, 6]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Oc4JR47TEdyb7ozkoKU63Q" type="4011" source="_B8Wn8I7TEdyb7ozkoKU63Q" target="_B1WoEI7TEdyb7ozkoKU63Q">
- <children xmi:type="notation:Node" xmi:id="_Oc4JS47TEdyb7ozkoKU63Q" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Oc4JTI7TEdyb7ozkoKU63Q" y="20"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Oc4JTY7TEdyb7ozkoKU63Q" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Oc4JTo7TEdyb7ozkoKU63Q" y="-15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Oc4JT47TEdyb7ozkoKU63Q" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Oc4JUI7TEdyb7ozkoKU63Q" x="6" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Oc4JUY7TEdyb7ozkoKU63Q" type="6005">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Oc4JUo7TEdyb7ozkoKU63Q" y="-30"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Oc4JU47TEdyb7ozkoKU63Q" type="6006">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Oc4JVI7TEdyb7ozkoKU63Q" y="-30"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Oc4JVY7TEdyb7ozkoKU63Q" type="6007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Oc4JVo7TEdyb7ozkoKU63Q" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Oc4JV47TEdyb7ozkoKU63Q" type="6008">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Oc4JWI7TEdyb7ozkoKU63Q" y="15"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_Oc4JSI7TEdyb7ozkoKU63Q"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Oc4JSY7TEdyb7ozkoKU63Q"/>
- <element xmi:type="uml:Association" href="Figure 9.20 - Properties.uml#_Oc4JQI7TEdyb7ozkoKU63Q"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Oc4JSo7TEdyb7ozkoKU63Q" points="[-43, 36, 94, -79]$[-133, 102, 4, -13]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OdBTMI7TEdyb7ozkoKU63Q" id="(0.58,0.17105263)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/plugin.properties b/tests/org.eclipse.uml2.diagram.csd.tests/plugin.properties
deleted file mode 100644
index a4d6aa5..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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:
-# Tatiana Fesenko - initial API and implementation
-###############################################################################
-pluginName=UML2 Composite Structure Diagram Tests Plug-in
-providerName=Eclipse.org
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/plugin.xml b/tests/org.eclipse.uml2.diagram.csd.tests/plugin.xml
deleted file mode 100644
index 17ce305..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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:
- Tatiana Fesenko (Borland) - initial API and implementation
--->
-
-<plugin>
-</plugin>
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/AllTests.java b/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/AllTests.java
deleted file mode 100644
index 3116684..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/AllTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.uml2.diagram.csd.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.uml2.diagram.csd.tests.tool.ChildrenGroupTest;
-import org.eclipse.uml2.diagram.csd.tests.tool.NodesGroupTest;
-import org.eclipse.uml2.diagram.csd.whole.TestWholeDiagramSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.uml2.diagram.csd");
- //$JUnit-BEGIN$
- suite.addTest(new TestWholeDiagramSuite());
- suite.addTestSuite(NodesGroupTest.class);
- suite.addTestSuite(ChildrenGroupTest.class);
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/CSDiagramFacade.java b/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/CSDiagramFacade.java
deleted file mode 100644
index 9ed4ee4..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/CSDiagramFacade.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.uml2.diagram.csd.tests;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.csd.part.UMLDiagramEditorUtil;
-
-
-public class CSDiagramFacade extends UMLDiagramFacade {
-
- public CSDiagramFacade(String path) {
- super(path, DIAGRAM_FILE_EXTENSION);
- }
-
- @Override
- protected Resource createDiagram(URI diagramModelURI, URI domainModelURI) {
- return UMLDiagramEditorUtil.createDiagram(diagramModelURI, domainModelURI, new NullProgressMonitor());
- }
-
- public static final String DIAGRAM_FILE_EXTENSION = "umlcompositestructures_diagram";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/tool/CSDCreationToolTestBase.java b/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/tool/CSDCreationToolTestBase.java
deleted file mode 100644
index 67ec919..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/tool/CSDCreationToolTestBase.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.eclipse.uml2.diagram.csd.tests.tool;
-
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.common.tool.CreationToolTestBase;
-import org.eclipse.uml2.diagram.csd.tests.CSDiagramFacade;
-
-
-public class CSDCreationToolTestBase extends CreationToolTestBase {
-
- public CSDCreationToolTestBase(String name) {
- super(name);
- }
-
- @Override
- protected UMLDiagramFacade getDiagram(String projectPath) {
- return new CSDiagramFacade(projectPath);
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/tool/ChildrenGroupTest.java b/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/tool/ChildrenGroupTest.java
deleted file mode 100644
index 1bd3c79..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/tool/ChildrenGroupTest.java
+++ /dev/null
@@ -1,330 +0,0 @@
-package org.eclipse.uml2.diagram.csd.tests.tool;
-
-import java.util.Collections;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.uml2.diagram.csd.edit.parts.Class3EditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.ClassAttributesEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.ClassClass_contentsEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.ClassEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.ClassOperationsEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.CollaborationContentsEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.CollaborationEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.CollaborationUse2EditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.ElementImportEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.InstanceSpecificationEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.InstanceSpecificationSlotsEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.OperationEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.Package2EditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.PackageImportsEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.Port3EditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.PortEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.Property2EditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.Property3EditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.PropertyEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.SlotEditPart;
-import org.eclipse.uml2.diagram.csd.part.UMLPaletteFactory;
-import org.eclipse.uml2.diagram.csd.part.UMLVisualIDRegistry;
-
-public class ChildrenGroupTest extends CSDCreationToolTestBase {
-
- PaletteRoot myRoot = new PaletteRoot();
-
- /**
- * @generated
- */
- Tool myElementImportTool;
-
- /**
- * @generated
- */
- Tool myAttributeTool;
-
- /**
- * @generated
- */
- Tool myOperationTool;
-
- /**
- * @generated
- */
- Tool myPortTool;
-
- /**
- * @generated
- */
- Tool myCollaborationUseTool;
-
- /**
- * @generated
- */
- Tool mySlotTool;
-
- /**
- * @generated
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- new UMLPaletteFactory().fillPalette(myRoot);
- myElementImportTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(0)).createTool();
- myAttributeTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(1)).createTool();
- myOperationTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(2)).createTool();
- myPortTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(3)).createTool();
- myCollaborationUseTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(4)).createTool();
- mySlotTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(5)).createTool();
- }
-
- /**
- * @generated
- */
- public ChildrenGroupTest(String name) {
- super(name);
- }
-
- /**
- * @generated
- */
- public void testElementImport() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- IGraphicalEditPart editPart1 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Package2EditPart.VISUAL_ID));
- assertNotNull(editPart1);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment1 = editPart1.getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageImportsEditPart.VISUAL_ID));
- assertNotNull(compartment1);
-
- createNodeByTool(myElementImportTool, 10, 10);
-
- IGraphicalEditPart editPart2 = compartment1.getChildBySemanticHint(UMLVisualIDRegistry.getType(ElementImportEditPart.VISUAL_ID));
- assertNotNull(editPart2);
- assertEquals("ElementImport", getMetaclassName(editPart2));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPropertyInCollaboration() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
- Tool tool1;
- tool1 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.usecase.Collaboration_2005")));
-
- createNodeByTool(tool1, 200, 100);
-
- IGraphicalEditPart editPart3 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationEditPart.VISUAL_ID));
- assertNotNull(editPart3);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment2 = editPart3.getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationContentsEditPart.VISUAL_ID));
- assertNotNull(compartment2);
-
- createNodeByTool(myAttributeTool, 275, 130);
-
- IGraphicalEditPart editPart4 = compartment2.getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyEditPart.VISUAL_ID));
- assertNotNull(editPart4);
- assertEquals("Property", getMetaclassName(editPart4));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPropertyInClass() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
- Tool tool2;
- tool2 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.usecase.Class_2006")));
-
- createNodeByTool(tool2, 200, 100);
-
- IGraphicalEditPart editPart5 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassEditPart.VISUAL_ID));
- assertNotNull(editPart5);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment3 = editPart5.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassAttributesEditPart.VISUAL_ID));
- assertNotNull(compartment3);
-
- createNodeByTool(myAttributeTool, 201, 101);
-
- IGraphicalEditPart editPart6 = compartment3.getChildBySemanticHint(UMLVisualIDRegistry.getType(Property2EditPart.VISUAL_ID));
- assertNotNull(editPart6);
- assertEquals("Property", getMetaclassName(editPart6));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPropertyInExpandedClass() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
- Tool tool3;
- tool3 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.usecase.Class_2007")));
-
- createNodeByTool(tool3, 200, 100);
-
- IGraphicalEditPart editPart7 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Class3EditPart.VISUAL_ID));
- assertNotNull(editPart7);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment4 = editPart7.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassClass_contentsEditPart.VISUAL_ID));
- assertNotNull(compartment4);
-
- createNodeByTool(myAttributeTool, 201, 101);
-
- IGraphicalEditPart editPart8 = compartment4.getChildBySemanticHint(UMLVisualIDRegistry.getType(Property3EditPart.VISUAL_ID));
- assertNotNull(editPart8);
- assertEquals("Property", getMetaclassName(editPart8));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testOperationInClass() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
- Tool tool4;
- tool4 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.usecase.Class_2006")));
-
- createNodeByTool(tool4, 200, 100);
-
- IGraphicalEditPart editPart9 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassEditPart.VISUAL_ID));
- assertNotNull(editPart9);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment5 = editPart9.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassOperationsEditPart.VISUAL_ID));
- assertNotNull(compartment5);
-
- createNodeByTool(myOperationTool, 201, 101);
-
- IGraphicalEditPart editPart10 = compartment5.getChildBySemanticHint(UMLVisualIDRegistry.getType(OperationEditPart.VISUAL_ID));
- assertNotNull(editPart10);
- assertEquals("Operation", getMetaclassName(editPart10));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPortOnClass() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
- Tool tool5;
- tool5 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.usecase.Class_2006")));
-
- createNodeByTool(tool5, 200, 100);
-
- IGraphicalEditPart editPart11 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassEditPart.VISUAL_ID));
- assertNotNull(editPart11);
-
- getDiagramEditPart().getViewer().flush();
-
- createNodeByTool(myPortTool, 201, 101);
-
- IGraphicalEditPart editPart12 = editPart11.getChildBySemanticHint(UMLVisualIDRegistry.getType(PortEditPart.VISUAL_ID));
- assertNotNull(editPart12);
- assertEquals("Port", getMetaclassName(editPart12));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPortOnExpandedClass() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
- Tool tool6;
- tool6 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.usecase.Class_2007")));
-
- createNodeByTool(tool6, 200, 100);
-
- IGraphicalEditPart editPart13 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassEditPart.VISUAL_ID));
- assertNotNull(editPart13);
-
- getDiagramEditPart().getViewer().flush();
-
- createNodeByTool(myPortTool, 201, 101);
-
- IGraphicalEditPart editPart14 = editPart13.getChildBySemanticHint(UMLVisualIDRegistry.getType(Port3EditPart.VISUAL_ID));
- assertNotNull(editPart14);
- assertEquals("Port", getMetaclassName(editPart14));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testCollaborationUseInCollaboration() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
- Tool tool7;
- tool7 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.usecase.Collaboration_2005")));
-
- createNodeByTool(tool7, 200, 100);
-
- IGraphicalEditPart editPart15 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationEditPart.VISUAL_ID));
- assertNotNull(editPart15);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment6 = editPart15.getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationContentsEditPart.VISUAL_ID));
- assertNotNull(compartment6);
-
- createNodeByTool(myCollaborationUseTool, 275, 130);
-
- IGraphicalEditPart editPart16 = compartment6.getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationUse2EditPart.VISUAL_ID));
- assertNotNull(editPart16);
- assertEquals("CollaborationUse", getMetaclassName(editPart16));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testSlotInInstanceSpecification() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
- Tool tool8;
- tool8 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.usecase.InstanceSpecification_2011")));
-
- createNodeByTool(tool8, 200, 100);
-
- IGraphicalEditPart editPart17 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationEditPart.VISUAL_ID));
- assertNotNull(editPart17);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment7 = editPart17.getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationSlotsEditPart.VISUAL_ID));
- assertNotNull(compartment7);
-
- createNodeByTool(mySlotTool, 201, 101);
-
- IGraphicalEditPart editPart18 = compartment7.getChildBySemanticHint(UMLVisualIDRegistry.getType(SlotEditPart.VISUAL_ID));
- assertNotNull(editPart18);
- assertEquals("Slot", getMetaclassName(editPart18));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- private static java.lang.String getMetaclassName(IGraphicalEditPart editPart) {
- return editPart.getNotationView().getElement().eClass().getName();
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/tool/NodesGroupTest.java b/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/tool/NodesGroupTest.java
deleted file mode 100644
index a63b6a6..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/tests/tool/NodesGroupTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.eclipse.uml2.diagram.csd.tests.tool;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.Class2EditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.ClassClassesEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.ClassEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.CollaborationEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.ConstraintEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.InstanceSpecificationEditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.InterfaceEditPart;
-import org.eclipse.uml2.diagram.csd.part.UMLPaletteFactory;
-import org.eclipse.uml2.diagram.csd.part.UMLVisualIDRegistry;
-
-public class NodesGroupTest extends CSDCreationToolTestBase {
-
- PaletteRoot myRoot = new PaletteRoot();
-
- Tool myCollaborationTool;
-
- Tool myClassTool;
-
- Tool myInterfaceTool;
-
- Tool myInstanceSpecificationTool;
-
- Tool myConstraintTool;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- new UMLPaletteFactory().fillPalette(myRoot);
- myCollaborationTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(0)).createTool();
- myClassTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(1)).createTool();
- myInterfaceTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(2)).createTool();
- myInstanceSpecificationTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(3)).createTool();
- myConstraintTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(4)).createTool();
- }
-
- public NodesGroupTest(String name) {
- super(name);
- }
-
- /**
- * @generated
- */
- public void testCollaborationOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myCollaborationTool, 200, 100);
-
- IGraphicalEditPart editPart1 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(CollaborationEditPart.VISUAL_ID));
- assertNotNull(editPart1);
- assertEquals("Collaboration", getMetaclassName(editPart1));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testClassOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myClassTool, 200, 100);
-
- IGraphicalEditPart editPart2 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassEditPart.VISUAL_ID));
- assertNotNull(editPart2);
- assertEquals("Class", getMetaclassName(editPart2));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testInterfaceOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myInterfaceTool, 200, 100);
-
- IGraphicalEditPart editPart3 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(InterfaceEditPart.VISUAL_ID));
- assertNotNull(editPart3);
- assertEquals("Interface", getMetaclassName(editPart3));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testInstanceSpecificationOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myInstanceSpecificationTool, 200, 100);
-
- IGraphicalEditPart editPart4 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(InstanceSpecificationEditPart.VISUAL_ID));
- assertNotNull(editPart4);
- assertEquals("InstanceSpecification", getMetaclassName(editPart4));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testConstraintOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myConstraintTool, 200, 100);
-
- IGraphicalEditPart editPart5 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintEditPart.VISUAL_ID));
- assertNotNull(editPart5);
- assertEquals("Constraint", getMetaclassName(editPart5));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testClassInClass() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myClassTool, 200, 100);
-
- IGraphicalEditPart editPart6 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassEditPart.VISUAL_ID));
- assertNotNull(editPart6);
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment1 = editPart6.getChildBySemanticHint(UMLVisualIDRegistry.getType(ClassClassesEditPart.VISUAL_ID));
- assertNotNull(compartment1);
-
- createNodeByTool(myClassTool, 201, 101);
-
- IGraphicalEditPart editPart7 = compartment1.getChildBySemanticHint(UMLVisualIDRegistry.getType(Class2EditPart.VISUAL_ID));
- assertNotNull(editPart7);
- assertEquals("Class", getMetaclassName(editPart7));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- private static java.lang.String getMetaclassName(IGraphicalEditPart editPart) {
- return editPart.getNotationView().getElement().eClass().getName();
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/whole/TestWholeCSDiagram.java b/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/whole/TestWholeCSDiagram.java
deleted file mode 100644
index f14448d..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/whole/TestWholeCSDiagram.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.uml2.diagram.csd.whole;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collections;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.uml2.diagram.common.wholediagram.TestWholeDiagram;
-import org.eclipse.uml2.diagram.common.wholediagram.UMLInitDiagramFacade;
-import org.eclipse.uml2.diagram.csd.edit.parts.Package2EditPart;
-import org.eclipse.uml2.diagram.csd.edit.parts.PackageEditPart;
-import org.eclipse.uml2.diagram.csd.part.UMLDiagramEditorPlugin;
-import org.osgi.framework.Bundle;
-
-public class TestWholeCSDiagram extends TestWholeDiagram {
-
- public TestWholeCSDiagram(String modelFileName, String diagramFileName) {
- super(modelFileName, diagramFileName);
- }
-
- @Override
- protected UMLInitDiagramFacade getInitDiagramFacade(IFile modelFile, IFile diagramFile) {
- return new UMLInitDiagramFacade(modelFile, diagramFile, org.eclipse.uml2.diagram.csd.part.UMLDiagramEditor.ID) {
-
- @Override
- protected Diagram createDiagramView(EObject modelRoot) {
- return ViewService.createDiagram(modelRoot, PackageEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
- }
-
- @Override
- public Diagram getDiagramView() throws ExecutionException, IOException, CoreException {
- Diagram result = super.getDiagramView();
-// diagram should be refresh when link to link exists.
- UMLInitDiagramFacade.refreshDiagram(result);
- return result;
- }
-
- };
- }
-
- @Override
- protected URL findFileInTestPlugin(String fileName) {
- return FileLocator.find(UML_TEST_BUNDLE, new Path(EXAMPLE_FOLDER).append(fileName), Collections.EMPTY_MAP);
- }
-
- @Override
- protected boolean ignoreView(int visualId) {
- return super.ignoreView(visualId) || Package2EditPart.VISUAL_ID == visualId;
- }
-
- private final static Bundle UML_TEST_BUNDLE = Platform.getBundle("org.eclipse.uml2.diagram.csd.tests");
-
- private final static String EXAMPLE_FOLDER = "examples/";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/whole/TestWholeDiagramSuite.java b/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/whole/TestWholeDiagramSuite.java
deleted file mode 100644
index ddc2b78..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/src/org/eclipse/uml2/diagram/csd/whole/TestWholeDiagramSuite.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.uml2.diagram.csd.whole;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.uml2.diagram.csd.tests.CSDiagramFacade;
-
-import junit.framework.TestSuite;
-
-public class TestWholeDiagramSuite extends TestSuite {
-
- public TestWholeDiagramSuite() {
- for (String name : oursDiagramFiles) {
- addTest(new TestWholeCSDiagram(name + ".uml", name + "." + CSDiagramFacade.DIAGRAM_FILE_EXTENSION));
- }
-
- }
-
- private static List<String> oursDiagramFiles = new ArrayList<String>();
- static {
- oursDiagramFiles.add("Figure 9.11 - The internal structure of the Observer collaboration shown inside the collaboration icon");
- oursDiagramFiles.add("Figure 9.14 - The BrokeredSale collaboration");
- oursDiagramFiles.add("Figure 9.16 - Port notation");
- oursDiagramFiles.add("Figure 9.19 - Port examples");
- oursDiagramFiles.add("Figure 9.20 - Properties");
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.csd.tests/test.xml b/tests/org.eclipse.uml2.diagram.csd.tests/test.xml
deleted file mode 100644
index a32e9c0..0000000
--- a/tests/org.eclipse.uml2.diagram.csd.tests/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<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.uml2.diagram.csd.tests"/>
- <property name="library-file" value="${eclipse-home}/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="uml2-tools-folder" value="${eclipse-home}/uml2_tools_folder"/>
- <delete dir="${uml2-tools-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${uml2-tools-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.uml2.diagram.csd.tests.AllTests"/>
- <property name="vmargs" value="-ea -Xmx512M"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/.classpath b/tests/org.eclipse.uml2.diagram.deploy.tests/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/.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/tests/org.eclipse.uml2.diagram.deploy.tests/.project b/tests/org.eclipse.uml2.diagram.deploy.tests/.project
deleted file mode 100644
index c6ec1f8..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.deploy.tests</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/tests/org.eclipse.uml2.diagram.deploy.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.uml2.diagram.deploy.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0d0461b..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Apr 10 17:34:38 CEST 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/tests/org.eclipse.uml2.diagram.deploy.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.diagram.deploy.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 621b180..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.deploy.tests;singleton:=true
-Bundle-Version: 0.7.1.qualifier
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Require-Bundle: org.junit;bundle-version="3.8.2",
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.emf.ecore,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.notation,
- org.eclipse.gmf.runtime.common.ui,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.ui.ide;bundle-version="3.4.0",
- org.eclipse.uml2.diagram.common.tests;bundle-version="0.7.1",
- org.eclipse.uml2.diagram.deploy;bundle-version="0.8.0"
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/about.html b/tests/org.eclipse.uml2.diagram.deploy.tests/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/tests/org.eclipse.uml2.diagram.deploy.tests/build.properties b/tests/org.eclipse.uml2.diagram.deploy.tests/build.properties
deleted file mode 100644
index c458c2b..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- examples/,\
- plugin.properties,\
- test.xml,\
- plugin.xml
-src.includes = about.html,\
- test.xml
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.13 - A DeploymentSpecification for an artifact.uml b/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.13 - A DeploymentSpecification for an artifact.uml
deleted file mode 100644
index 05ac973..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.13 - A DeploymentSpecification for an artifact.uml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_UbZnAKMoEdyC7dOJ7ALdqw" name="F 10-13">
- <elementImport xmi:id="_Ub1E0KMoEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_Ub1E0aMoEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_Ub1r4KMoEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_Ub1r4aMoEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Artifact" xmi:id="_Xys6AKMoEdyC7dOJ7ALdqw" fileName="Order.jar"/>
- <packagedElement xmi:type="uml:Node" xmi:id="_Z5PIsKMoEdyC7dOJ7ALdqw" name="AppServer" clientDependency="_bqZkUKMoEdyC7dOJ7ALdqw">
- <deployment xmi:id="_bqZkUKMoEdyC7dOJ7ALdqw" supplier="_Xys6AKMoEdyC7dOJ7ALdqw" client="_Z5PIsKMoEdyC7dOJ7ALdqw" deployedArtifact="_Xys6AKMoEdyC7dOJ7ALdqw">
- <configuration xmi:id="_d3oQ4KMoEdyC7dOJ7ALdqw" name="OrderDesc.xml">
- <ownedAttribute xmi:id="_gstnoKMoEdyC7dOJ7ALdqw" name="property1">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Boolean"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_qSM7MKMoEdyC7dOJ7ALdqw" name="property2">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EString"/>
- </ownedAttribute>
- </configuration>
- </deployment>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.13 - A DeploymentSpecification for an artifact.umldeployment_diagram b/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.13 - A DeploymentSpecification for an artifact.umldeployment_diagram
deleted file mode 100644
index a8e77f8..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.13 - A DeploymentSpecification for an artifact.umldeployment_diagram
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_Ub1r4qMoEdyC7dOJ7ALdqw" type="UMLDeployment" name="Figure 10.13 - A DeploymentSpecification for an artifact.umldeployment_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_UpcDAKMoEdyC7dOJ7ALdqw" type="2001">
- <children xmi:type="notation:Node" xmi:id="_UpcDA6MoEdyC7dOJ7ALdqw" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_UpcDBKMoEdyC7dOJ7ALdqw" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_UpcDBaMoEdyC7dOJ7ALdqw" collapsed="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_UpcDBqMoEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_UpcDB6MoEdyC7dOJ7ALdqw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_UpcDAaMoEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Package" href="Figure 10.13 - A DeploymentSpecification for an artifact.uml#_UbZnAKMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UpcDAqMoEdyC7dOJ7ALdqw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Xyv9UKMoEdyC7dOJ7ALdqw" type="2006">
- <children xmi:type="notation:Node" xmi:id="_Xyv9U6MoEdyC7dOJ7ALdqw" type="5005"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Xyv9UaMoEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Artifact" href="Figure 10.13 - A DeploymentSpecification for an artifact.uml#_Xys6AKMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xyv9UqMoEdyC7dOJ7ALdqw" x="156" y="48" width="105"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Z5Q94KMoEdyC7dOJ7ALdqw" type="2004">
- <children xmi:type="notation:Node" xmi:id="_Z5Rk8KMoEdyC7dOJ7ALdqw" type="5003"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Z5Q94aMoEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Node" href="Figure 10.13 - A DeploymentSpecification for an artifact.uml#_Z5PIsKMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z5Q94qMoEdyC7dOJ7ALdqw" x="144" y="192" width="120" height="68"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_d3pfAKMoEdyC7dOJ7ALdqw" type="2007">
- <children xmi:type="notation:Node" xmi:id="_d3qtIKMoEdyC7dOJ7ALdqw" type="5006"/>
- <children xmi:type="notation:Node" xmi:id="_d3rUMKMoEdyC7dOJ7ALdqw" type="7003">
- <children xmi:type="notation:Node" xmi:id="_gsxSAKMoEdyC7dOJ7ALdqw" type="3003">
- <element xmi:type="uml:Property" href="Figure 10.13 - A DeploymentSpecification for an artifact.uml#_gstnoKMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_gsxSAaMoEdyC7dOJ7ALdqw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_qSOJUKMoEdyC7dOJ7ALdqw" type="3003">
- <element xmi:type="uml:Property" href="Figure 10.13 - A DeploymentSpecification for an artifact.uml#_qSM7MKMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_qSOJUaMoEdyC7dOJ7ALdqw"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_d3rUMaMoEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_d3rUMqMoEdyC7dOJ7ALdqw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_d3pfAaMoEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:DeploymentSpecification" href="Figure 10.13 - A DeploymentSpecification for an artifact.uml#_d3oQ4KMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_d3pfAqMoEdyC7dOJ7ALdqw" x="336" y="120"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_Ub1r46MoEdyC7dOJ7ALdqw"/>
- <element xmi:type="uml:Package" href="Figure 10.13 - A DeploymentSpecification for an artifact.uml#_UbZnAKMoEdyC7dOJ7ALdqw"/>
- <edges xmi:type="notation:Edge" xmi:id="_bqbZgKMoEdyC7dOJ7ALdqw" type="4001" source="_Z5Q94KMoEdyC7dOJ7ALdqw" target="_Xyv9UKMoEdyC7dOJ7ALdqw">
- <children xmi:type="notation:Node" xmi:id="_bqbZhKMoEdyC7dOJ7ALdqw" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_bqbZhaMoEdyC7dOJ7ALdqw" x="3" y="-36"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_bqbZgaMoEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_bqbZgqMoEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Deployment" href="Figure 10.13 - A DeploymentSpecification for an artifact.uml#_bqZkUKMoEdyC7dOJ7ALdqw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bqbZg6MoEdyC7dOJ7ALdqw" points="[-1, -15, 16, 114]$[-13, -159, 4, -30]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bqdOsKMoEdyC7dOJ7ALdqw" id="(0.675,0.22058824)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_wk5oUKMoEdyC7dOJ7ALdqw" type="4003" source="_bqbZgKMoEdyC7dOJ7ALdqw" target="_d3pfAKMoEdyC7dOJ7ALdqw">
- <styles xmi:type="notation:RoutingStyle" xmi:id="_wk5oUaMoEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_wk5oUqMoEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wk5oU6MoEdyC7dOJ7ALdqw" points="[-3, 0, -172, 0]$[152, -7, -17, -7]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wldpAKMoEdyC7dOJ7ALdqw" id="(0.76842105,0.5315315)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wldpAaMoEdyC7dOJ7ALdqw" id="(0.10625,0.24)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.14 - Notation for a Device.uml b/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.14 - Notation for a Device.uml
deleted file mode 100644
index 262575e..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.14 - Notation for a Device.uml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_4De5wKMoEdyC7dOJ7ALdqw" name="F 10-14">
- <elementImport xmi:id="_4EUAMKMoEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_4EUAMaMoEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_4EUAMqMoEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_4EUAM6MoEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Device" xmi:id="_5gY8oKMoEdyC7dOJ7ALdqw" name="AppServer">
- <ownedAttribute xmi:id="_bB49YaMpEdyC7dOJ7ALdqw" name="dst" type="_N7quAKMpEdyC7dOJ7ALdqw" association="_bBxBkKMpEdyC7dOJ7ALdqw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bB5kcaMpEdyC7dOJ7ALdqw" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bB5kcKMpEdyC7dOJ7ALdqw" value="1"/>
- </ownedAttribute>
- <nestedNode xmi:type="uml:ExecutionEnvironment" xmi:id="_7wORQKMoEdyC7dOJ7ALdqw" name="J2EE Server">
- <nestedClassifier xmi:type="uml:Artifact" xmi:id="_9HtBkKMoEdyC7dOJ7ALdqw" fileName="Order.jar"/>
- <nestedClassifier xmi:type="uml:Artifact" xmi:id="__EmMEKMoEdyC7dOJ7ALdqw" fileName="ShoppingCart.jar"/>
- <nestedClassifier xmi:type="uml:Artifact" xmi:id="_Bm2tcKMpEdyC7dOJ7ALdqw" fileName="Service.jar"/>
- </nestedNode>
- </packagedElement>
- <packagedElement xmi:type="uml:Device" xmi:id="_N7quAKMpEdyC7dOJ7ALdqw" name="DBServer">
- <nestedClassifier xmi:type="uml:Artifact" xmi:id="_QI0iEKMpEdyC7dOJ7ALdqw" fileName="itemShema.ddl"/>
- <nestedClassifier xmi:type="uml:Artifact" xmi:id="_T-LqEKMpEdyC7dOJ7ALdqw" fileName="OrderSchema.ddl"/>
- </packagedElement>
- <packagedElement xmi:type="uml:CommunicationPath" xmi:id="_bBxBkKMpEdyC7dOJ7ALdqw" name="ssh" memberEnd="_bB4WUKMpEdyC7dOJ7ALdqw _bB49YaMpEdyC7dOJ7ALdqw">
- <ownedEnd xmi:id="_bB4WUKMpEdyC7dOJ7ALdqw" name="src" type="_5gY8oKMoEdyC7dOJ7ALdqw" association="_bBxBkKMpEdyC7dOJ7ALdqw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_bB49YKMpEdyC7dOJ7ALdqw" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bB4WUaMpEdyC7dOJ7ALdqw" value="1"/>
- </ownedEnd>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.14 - Notation for a Device.umldeployment_diagram b/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.14 - Notation for a Device.umldeployment_diagram
deleted file mode 100644
index 6834bba..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.14 - Notation for a Device.umldeployment_diagram
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_4EUANKMoEdyC7dOJ7ALdqw" type="UMLDeployment" name="Figure 10.14 - Notation for a Device.umldeployment_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_4RwmUKMoEdyC7dOJ7ALdqw" type="2001">
- <children xmi:type="notation:Node" xmi:id="_4RwmU6MoEdyC7dOJ7ALdqw" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_4RwmVKMoEdyC7dOJ7ALdqw" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_4RwmVaMoEdyC7dOJ7ALdqw" collapsed="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_4RwmVqMoEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_4RwmV6MoEdyC7dOJ7ALdqw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_4RwmUaMoEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Package" href="Figure 10.14 - Notation for a Device.uml#_4De5wKMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4RwmUqMoEdyC7dOJ7ALdqw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_5gaKwKMoEdyC7dOJ7ALdqw" type="2003">
- <children xmi:type="notation:Node" xmi:id="_5gaKw6MoEdyC7dOJ7ALdqw" type="5002"/>
- <children xmi:type="notation:Node" xmi:id="_5gaKxKMoEdyC7dOJ7ALdqw" type="7004">
- <children xmi:type="notation:Node" xmi:id="_7wRUkKMoEdyC7dOJ7ALdqw" type="3005">
- <children xmi:type="notation:Node" xmi:id="_7wR7oKMoEdyC7dOJ7ALdqw" type="5008"/>
- <children xmi:type="notation:Node" xmi:id="_7wSisKMoEdyC7dOJ7ALdqw" type="7006">
- <children xmi:type="notation:Node" xmi:id="_9Hu2wKMoEdyC7dOJ7ALdqw" type="3006">
- <element xmi:type="uml:Artifact" href="Figure 10.14 - Notation for a Device.uml#_9HtBkKMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_9Hu2waMoEdyC7dOJ7ALdqw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__EmzIKMoEdyC7dOJ7ALdqw" type="3006">
- <element xmi:type="uml:Artifact" href="Figure 10.14 - Notation for a Device.uml#__EmMEKMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="__EmzIaMoEdyC7dOJ7ALdqw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Bm5JsKMpEdyC7dOJ7ALdqw" type="3006">
- <element xmi:type="uml:Artifact" href="Figure 10.14 - Notation for a Device.uml#_Bm2tcKMpEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Bm5JsaMpEdyC7dOJ7ALdqw"/>
- </children>
- <styles xmi:type="notation:TitleStyle" xmi:id="_7wSisaMoEdyC7dOJ7ALdqw" showTitle="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_7wSisqMoEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_7wSis6MoEdyC7dOJ7ALdqw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_7wRUkaMoEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:ExecutionEnvironment" href="Figure 10.14 - Notation for a Device.uml#_7wORQKMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7wRUkqMoEdyC7dOJ7ALdqw" x="54" y="31" width="181" height="157"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5gaKxaMoEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5gaKxqMoEdyC7dOJ7ALdqw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_5gaKwaMoEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Device" href="Figure 10.14 - Notation for a Device.uml#_5gY8oKMoEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5gaKwqMoEdyC7dOJ7ALdqw" x="84" y="84" width="301" height="397"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_N7r8IKMpEdyC7dOJ7ALdqw" type="2003">
- <children xmi:type="notation:Node" xmi:id="_N7r8I6MpEdyC7dOJ7ALdqw" type="5002"/>
- <children xmi:type="notation:Node" xmi:id="_N7r8JKMpEdyC7dOJ7ALdqw" type="7004">
- <children xmi:type="notation:Node" xmi:id="_QI1wMKMpEdyC7dOJ7ALdqw" type="3002">
- <children xmi:type="notation:Node" xmi:id="_QI1wM6MpEdyC7dOJ7ALdqw" type="5007"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_QI1wMaMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Artifact" href="Figure 10.14 - Notation for a Device.uml#_QI0iEKMpEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QI1wMqMpEdyC7dOJ7ALdqw" x="18" y="31" width="109"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_T-MRIKMpEdyC7dOJ7ALdqw" type="3002">
- <children xmi:type="notation:Node" xmi:id="_T-MRI6MpEdyC7dOJ7ALdqw" type="5007"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_T-MRIaMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Artifact" href="Figure 10.14 - Notation for a Device.uml#_T-LqEKMpEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T-MRIqMpEdyC7dOJ7ALdqw" x="150" y="100" width="115"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_N7r8JaMpEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_N7r8JqMpEdyC7dOJ7ALdqw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_N7r8IaMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Device" href="Figure 10.14 - Notation for a Device.uml#_N7quAKMpEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N7r8IqMpEdyC7dOJ7ALdqw" x="540" y="168" width="301" height="253"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_4EUANaMoEdyC7dOJ7ALdqw"/>
- <element xmi:type="uml:Package" href="Figure 10.14 - Notation for a Device.uml#_4De5wKMoEdyC7dOJ7ALdqw"/>
- <edges xmi:type="notation:Edge" xmi:id="_bB9O0KMpEdyC7dOJ7ALdqw" type="4004" source="_5gaKwKMoEdyC7dOJ7ALdqw" target="_N7r8IKMpEdyC7dOJ7ALdqw">
- <children xmi:type="notation:Node" xmi:id="_bB_EAKMpEdyC7dOJ7ALdqw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_bB_EAaMpEdyC7dOJ7ALdqw" x="19" y="-35"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_bB914KMpEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_bB914aMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:CommunicationPath" href="Figure 10.14 - Notation for a Device.uml#_bBxBkKMpEdyC7dOJ7ALdqw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bB914qMpEdyC7dOJ7ALdqw" points="[23, 7, -211, -69]$[214, 61, -20, -15]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bCPisKMpEdyC7dOJ7ALdqw" id="(0.9667774,0.28463477)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bCPisaMpEdyC7dOJ7ALdqw" id="(0.06644518,0.10671937)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml b/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml
deleted file mode 100644
index 58854df..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_pFXfMKMpEdyC7dOJ7ALdqw" name="F 10-17">
- <elementImport xmi:id="_pGT6YKMpEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_pGT6YaMpEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_pGUhcKMpEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_pGUhcaMpEdyC7dOJ7ALdqw">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Node" xmi:id="_r52ZAKMpEdyC7dOJ7ALdqw" name="AppServer" clientDependency="_zXsDkKMpEdyC7dOJ7ALdqw _0bXHEKMpEdyC7dOJ7ALdqw">
- <ownedAttribute xmi:id="_uLr4w6MpEdyC7dOJ7ALdqw" name="dst" type="_s4Zr8KMpEdyC7dOJ7ALdqw" association="_uLqqoKMpEdyC7dOJ7ALdqw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uLsf0aMpEdyC7dOJ7ALdqw" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uLsf0KMpEdyC7dOJ7ALdqw" value="1"/>
- </ownedAttribute>
- <deployment xmi:id="_zXsDkKMpEdyC7dOJ7ALdqw" supplier="_vtLgsKMpEdyC7dOJ7ALdqw" client="_r52ZAKMpEdyC7dOJ7ALdqw" deployedArtifact="_vtLgsKMpEdyC7dOJ7ALdqw"/>
- <deployment xmi:id="_0bXHEKMpEdyC7dOJ7ALdqw" supplier="_xsklkKMpEdyC7dOJ7ALdqw" client="_r52ZAKMpEdyC7dOJ7ALdqw" deployedArtifact="_xsklkKMpEdyC7dOJ7ALdqw"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Node" xmi:id="_s4Zr8KMpEdyC7dOJ7ALdqw" name="DBServer"/>
- <packagedElement xmi:type="uml:CommunicationPath" xmi:id="_uLqqoKMpEdyC7dOJ7ALdqw" name="ssh" memberEnd="_uLr4wKMpEdyC7dOJ7ALdqw _uLr4w6MpEdyC7dOJ7ALdqw">
- <ownedEnd xmi:id="_uLr4wKMpEdyC7dOJ7ALdqw" name="src" type="_r52ZAKMpEdyC7dOJ7ALdqw" association="_uLqqoKMpEdyC7dOJ7ALdqw">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uLr4wqMpEdyC7dOJ7ALdqw" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uLr4waMpEdyC7dOJ7ALdqw" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Artifact" xmi:id="_vtLgsKMpEdyC7dOJ7ALdqw" fileName="RequestHandler.jar"/>
- <packagedElement xmi:type="uml:Artifact" xmi:id="_xsklkKMpEdyC7dOJ7ALdqw" fileName="Order.jar"/>
- <packagedElement xmi:type="uml:Device" xmi:id="_EYf5MKMqEdyC7dOJ7ALdqw" name="AppServer2">
- <nestedClassifier xmi:type="uml:Artifact" xmi:id="_FaStYKMqEdyC7dOJ7ALdqw" clientDependency="_NerakKMqEdyC7dOJ7ALdqw" fileName="Shopping Cart">
- <manifestation xmi:id="_NerakKMqEdyC7dOJ7ALdqw" supplier="_Lr-t4KMqEdyC7dOJ7ALdqw" client="_FaStYKMqEdyC7dOJ7ALdqw" utilizedElement="_Lr-t4KMqEdyC7dOJ7ALdqw"/>
- </nestedClassifier>
- <nestedClassifier xmi:type="uml:Artifact" xmi:id="_Lr-t4KMqEdyC7dOJ7ALdqw" fileName="Order.jar"/>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.17 - Communication path between two Node types with deployed Artifacts.umldeployment_diagram b/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.17 - Communication path between two Node types with deployed Artifacts.umldeployment_diagram
deleted file mode 100644
index 1e6b233..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/examples/Figure 10.17 - Communication path between two Node types with deployed Artifacts.umldeployment_diagram
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_pGUhcqMpEdyC7dOJ7ALdqw" type="UMLDeployment" name="Figure 10.17 - Communication path between two Node types with deployed Artifacts.umldeployment_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_pTmvgKMpEdyC7dOJ7ALdqw" type="2001">
- <children xmi:type="notation:Node" xmi:id="_pTnWkqMpEdyC7dOJ7ALdqw" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_pTnWk6MpEdyC7dOJ7ALdqw" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_pTnWlKMpEdyC7dOJ7ALdqw" collapsed="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_pTnWlaMpEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_pTnWlqMpEdyC7dOJ7ALdqw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_pTnWkKMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Package" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_pFXfMKMpEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pTnWkaMpEdyC7dOJ7ALdqw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_r54OMKMpEdyC7dOJ7ALdqw" type="2004">
- <children xmi:type="notation:Node" xmi:id="_r54OM6MpEdyC7dOJ7ALdqw" type="5003"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_r54OMaMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Node" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_r52ZAKMpEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_r54OMqMpEdyC7dOJ7ALdqw" x="288" y="120"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_s4ekcKMpEdyC7dOJ7ALdqw" type="2004">
- <children xmi:type="notation:Node" xmi:id="_s4fLgqMpEdyC7dOJ7ALdqw" type="5003"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_s4fLgKMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Node" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_s4Zr8KMpEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s4fLgaMpEdyC7dOJ7ALdqw" x="60" y="120"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_vtN88KMpEdyC7dOJ7ALdqw" type="2006">
- <children xmi:type="notation:Node" xmi:id="_vtOkAKMpEdyC7dOJ7ALdqw" type="5005"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_vtN88aMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Artifact" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_vtLgsKMpEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vtN88qMpEdyC7dOJ7ALdqw" x="372" y="252"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_xsnB0KMpEdyC7dOJ7ALdqw" type="2006">
- <children xmi:type="notation:Node" xmi:id="_xsnB06MpEdyC7dOJ7ALdqw" type="5005"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_xsnB0aMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Artifact" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_xsklkKMpEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xsnB0qMpEdyC7dOJ7ALdqw" x="180" y="252"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_EYi8gKMqEdyC7dOJ7ALdqw" type="2003">
- <children xmi:type="notation:Node" xmi:id="_EYi8g6MqEdyC7dOJ7ALdqw" type="5002"/>
- <children xmi:type="notation:Node" xmi:id="_EYi8hKMqEdyC7dOJ7ALdqw" type="7004">
- <children xmi:type="notation:Node" xmi:id="_FaT7gKMqEdyC7dOJ7ALdqw" type="3002">
- <children xmi:type="notation:Node" xmi:id="_FaUikKMqEdyC7dOJ7ALdqw" type="5007"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_FaT7gaMqEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Artifact" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_FaStYKMqEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FaT7gqMqEdyC7dOJ7ALdqw" x="17" y="17" width="105"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Lr_8AKMqEdyC7dOJ7ALdqw" type="3002">
- <children xmi:type="notation:Node" xmi:id="_LsAjEKMqEdyC7dOJ7ALdqw" type="5007"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Lr_8AaMqEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Artifact" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_Lr-t4KMqEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Lr_8AqMqEdyC7dOJ7ALdqw" x="193" y="19"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_EYi8haMqEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_EYi8hqMqEdyC7dOJ7ALdqw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_EYi8gaMqEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Device" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_EYf5MKMqEdyC7dOJ7ALdqw"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EYi8gqMqEdyC7dOJ7ALdqw" x="53" y="360" width="308" height="169"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_pGUhc6MpEdyC7dOJ7ALdqw"/>
- <element xmi:type="uml:Package" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_pFXfMKMpEdyC7dOJ7ALdqw"/>
- <edges xmi:type="notation:Edge" xmi:id="_uLtt8KMpEdyC7dOJ7ALdqw" type="4004" source="_r54OMKMpEdyC7dOJ7ALdqw" target="_s4ekcKMpEdyC7dOJ7ALdqw">
- <children xmi:type="notation:Node" xmi:id="_uLtt9KMpEdyC7dOJ7ALdqw" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_uLtt9aMpEdyC7dOJ7ALdqw" y="20"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_uLtt8aMpEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_uLtt8qMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:CommunicationPath" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_uLqqoKMpEdyC7dOJ7ALdqw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uLtt86MpEdyC7dOJ7ALdqw" points="[7, 1, -256, -24]$[247, 25, -16, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uLuVAKMpEdyC7dOJ7ALdqw" id="(0.93,0.4)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_uLuVAaMpEdyC7dOJ7ALdqw" id="(0.16,0.48333332)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_zsen0KMpEdyC7dOJ7ALdqw" type="4001" source="_r54OMKMpEdyC7dOJ7ALdqw" target="_vtN88KMpEdyC7dOJ7ALdqw">
- <children xmi:type="notation:Node" xmi:id="_zsfO4KMpEdyC7dOJ7ALdqw" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zsfO4aMpEdyC7dOJ7ALdqw" y="20"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_zsen0aMpEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_zsen0qMpEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Deployment" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_zXsDkKMpEdyC7dOJ7ALdqw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zsen06MpEdyC7dOJ7ALdqw" points="[25, 30, -84, -100]$[84, 100, -25, -30]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_BVKrEKMqEdyC7dOJ7ALdqw" type="4001" source="_r54OMKMpEdyC7dOJ7ALdqw" target="_xsnB0KMpEdyC7dOJ7ALdqw">
- <children xmi:type="notation:Node" xmi:id="_BVLSIKMqEdyC7dOJ7ALdqw" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_BVLSIaMqEdyC7dOJ7ALdqw" y="20"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_BVKrEaMqEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_BVKrEqMqEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Deployment" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_0bXHEKMpEdyC7dOJ7ALdqw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BVKrE6MqEdyC7dOJ7ALdqw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Neud4KMqEdyC7dOJ7ALdqw" type="4002" source="_FaT7gKMqEdyC7dOJ7ALdqw" target="_Lr_8AKMqEdyC7dOJ7ALdqw">
- <children xmi:type="notation:Node" xmi:id="_Neud5KMqEdyC7dOJ7ALdqw" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Neud5aMqEdyC7dOJ7ALdqw" y="20"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_Neud4aMqEdyC7dOJ7ALdqw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Neud4qMqEdyC7dOJ7ALdqw" fontName="Segoe UI"/>
- <element xmi:type="uml:Manifestation" href="Figure 10.17 - Communication path between two Node types with deployed Artifacts.uml#_NerakKMqEdyC7dOJ7ALdqw"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Neud46MqEdyC7dOJ7ALdqw" points="[53, 3, -111, 1]$[204, 3, 40, 1]"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/plugin.properties b/tests/org.eclipse.uml2.diagram.deploy.tests/plugin.properties
deleted file mode 100644
index 4b48e2f..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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:
-# Tatiana Fesenko - initial API and implementation
-###############################################################################
-pluginName=UML2 Deployment Diagram Tests Plug-in
-providerName=Eclipse.org
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/plugin.xml b/tests/org.eclipse.uml2.diagram.deploy.tests/plugin.xml
deleted file mode 100644
index 17ce305..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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:
- Tatiana Fesenko (Borland) - initial API and implementation
--->
-
-<plugin>
-</plugin>
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/AllTests.java b/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/AllTests.java
deleted file mode 100644
index c807c99..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/AllTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.uml2.diagram.deploy.tests;
-
-import org.eclipse.uml2.diagram.deploy.tests.tool.ChildrenTestPalette;
-import org.eclipse.uml2.diagram.deploy.tests.tool.NodeTestPalette;
-import org.eclipse.uml2.diagram.deploy.tests.whole.TestWholeDiagramSuite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.uml2.diagram.deploy");
- //$JUnit-BEGIN$
- suite.addTest(new TestWholeDiagramSuite());
- suite.addTestSuite(NodeTestPalette.class);
- suite.addTestSuite(ChildrenTestPalette.class);
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/DeployDiagramFacade.java b/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/DeployDiagramFacade.java
deleted file mode 100644
index 3ba2fa6..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/DeployDiagramFacade.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.uml2.diagram.deploy.tests;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.deploy.part.UMLDiagramEditorUtil;
-
-public class DeployDiagramFacade extends UMLDiagramFacade {
-
- public DeployDiagramFacade(String path) {
- super(path, DIAGRAM_FILE_EXTENSION);
- }
-
- @Override
- protected Resource createDiagram(URI diagramModelURI, URI domainModelURI) {
- return UMLDiagramEditorUtil.createDiagram(diagramModelURI, domainModelURI, new NullProgressMonitor());
- }
-
- public static final String DIAGRAM_FILE_EXTENSION = "umldeployment_diagram";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/tool/ChildrenTestPalette.java b/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/tool/ChildrenTestPalette.java
deleted file mode 100644
index 788f91e..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/tool/ChildrenTestPalette.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.eclipse.uml2.diagram.deploy.tests.tool;
-
-import java.util.Collections;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.uml2.diagram.deploy.edit.parts.DeploymentSpecificationEditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.DeploymentSpecificationPropertiesEditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.ElementImportEditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.Package2EditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.PackageImportsEditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.PropertyEditPart;
-import org.eclipse.uml2.diagram.deploy.part.UMLPaletteFactory;
-import org.eclipse.uml2.diagram.deploy.part.UMLVisualIDRegistry;
-
-public class ChildrenTestPalette extends DeployDCreationToolTestBase {
-
- /**
- * @generated
- */
- PaletteRoot myRoot;
-
- /**
- * @generated
- */
- Tool myElementImportTool;
-
- /**
- * @generated
- */
- Tool myPropertyTool;
-
- /**
- * @generated
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- myRoot = new PaletteRoot();
- new UMLPaletteFactory().fillPalette(myRoot);
- myElementImportTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(2)).getChildren().get(0)).createTool();
- myPropertyTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(2)).getChildren().get(1)).createTool();
- }
-
- /**
- * @generated
- */
- @Override
- protected void tearDown() throws Exception {
- myRoot = null;
- myElementImportTool = null;
- myPropertyTool = null;
-
- super.tearDown();
- }
-
- /**
- * @generated
- */
- public ChildrenTestPalette(String name) {
- super(name);
- }
-
- /**
- * @generated
- */
- public void testElementImport() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- IGraphicalEditPart editPart1 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Package2EditPart.VISUAL_ID));
- assertNotNull(editPart1);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment1 = editPart1.getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageImportsEditPart.VISUAL_ID));
- assertNotNull(compartment1);
-
- createNodeByTool(myElementImportTool, 10, 10);
-
- IGraphicalEditPart editPart2 = compartment1.getChildBySemanticHint(UMLVisualIDRegistry.getType(ElementImportEditPart.VISUAL_ID));
- assertNotNull(editPart2);
- assertEquals("ElementImport", getMetaclassName(editPart2));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testProperty() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool1;
- tool1 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.deploy.DeploymentSpecification_2007")));
-
- createNodeByTool(tool1, 200, 100);
-
- IGraphicalEditPart editPart3 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationEditPart.VISUAL_ID));
- assertNotNull(editPart3);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment2 = editPart3.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationPropertiesEditPart.VISUAL_ID));
- assertNotNull(compartment2);
-
- createNodeByTool(myPropertyTool, 201, 101);
-
- IGraphicalEditPart editPart4 = compartment2.getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyEditPart.VISUAL_ID));
- assertNotNull(editPart4);
- assertEquals("Property", getMetaclassName(editPart4));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
-
- private static java.lang.String getMetaclassName(IGraphicalEditPart editPart) {
- return editPart.getNotationView().getElement().eClass().getName();
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/tool/DeployDCreationToolTestBase.java b/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/tool/DeployDCreationToolTestBase.java
deleted file mode 100644
index 2c5d133..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/tool/DeployDCreationToolTestBase.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.uml2.diagram.deploy.tests.tool;
-
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.common.tool.CreationToolTestBase;
-import org.eclipse.uml2.diagram.deploy.tests.DeployDiagramFacade;
-
-public class DeployDCreationToolTestBase extends CreationToolTestBase {
-
- public DeployDCreationToolTestBase(String name) {
- super(name);
- }
-
- @Override
- protected UMLDiagramFacade getDiagram(String projectPath) {
- return new DeployDiagramFacade(projectPath);
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/tool/NodeTestPalette.java b/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/tool/NodeTestPalette.java
deleted file mode 100644
index d02ae97..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/tool/NodeTestPalette.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package org.eclipse.uml2.diagram.deploy.tests.tool;
-
-import java.util.Collections;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.uml2.diagram.deploy.edit.parts.Artifact2EditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.Artifact3EditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.ArtifactEditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.DeploymentSpecificationEditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.Device2EditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.DeviceDevicecontentsEditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.DeviceEditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.ExecutionEnvironment2EditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.ExecutionEnvironmentArtifactsEditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.ExecutionEnvironmentEditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.Node2EditPart;
-import org.eclipse.uml2.diagram.deploy.edit.parts.NodeEditPart;
-import org.eclipse.uml2.diagram.deploy.part.UMLPaletteFactory;
-import org.eclipse.uml2.diagram.deploy.part.UMLVisualIDRegistry;
-
-public class NodeTestPalette extends DeployDCreationToolTestBase {
-
- /**
- * @generated
- */
- PaletteRoot myRoot;
-
- /**
- * @generated
- */
- Tool myArtifactTool;
-
- /**
- * @generated
- */
- Tool myDeviceTool;
-
- /**
- * @generated
- */
- Tool myNodeTool;
-
- /**
- * @generated
- */
- Tool myEnvironmentTool;
-
- /**
- * @generated
- */
- Tool mySpecificationTool;
-
- /**
- * @generated
- */
- protected void setUp() throws Exception {
- super.setUp();
- myRoot = new PaletteRoot();
- new UMLPaletteFactory().fillPalette(myRoot);
- myArtifactTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(0)).createTool();
- myDeviceTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(1)).createTool();
- myNodeTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(2)).createTool();
- myEnvironmentTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(3)).createTool();
- mySpecificationTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(4)).createTool();
- }
-
- /**
- * @generated
- */
- protected void tearDown() throws Exception {
- myRoot = null;
- myArtifactTool = null;
- myDeviceTool = null;
- myNodeTool = null;
- myEnvironmentTool = null;
- mySpecificationTool = null;
-
- super.tearDown();
- }
-
- /**
- * @generated
- */
- public NodeTestPalette(String name) {
- super(name);
- }
-
- /**
- * @generated
- */
- public void testArtifactOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myArtifactTool, 200, 100);
-
- IGraphicalEditPart editPart1 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Artifact2EditPart.VISUAL_ID));
- assertNotNull(editPart1);
- assertEquals("Artifact", getMetaclassName(editPart1));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testDeviceOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myDeviceTool, 200, 100);
-
- IGraphicalEditPart editPart2 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceEditPart.VISUAL_ID));
- assertNotNull(editPart2);
- assertEquals("Device", getMetaclassName(editPart2));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testNodeOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myNodeTool, 200, 100);
-
- IGraphicalEditPart editPart3 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(NodeEditPart.VISUAL_ID));
- assertNotNull(editPart3);
- assertEquals("Node", getMetaclassName(editPart3));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testEnvironmentOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myEnvironmentTool, 200, 100);
-
- IGraphicalEditPart editPart4 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentEditPart.VISUAL_ID));
- assertNotNull(editPart4);
- assertEquals("ExecutionEnvironment", getMetaclassName(editPart4));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testSpecificationOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(mySpecificationTool, 200, 100);
-
- IGraphicalEditPart editPart5 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeploymentSpecificationEditPart.VISUAL_ID));
- assertNotNull(editPart5);
- assertEquals("DeploymentSpecification", getMetaclassName(editPart5));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testArtifactInDevice() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool1;
- tool1 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.deploy.Device_2003")));
-
- createNodeByTool(tool1, 200, 100);
-
- IGraphicalEditPart editPart6 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceEditPart.VISUAL_ID));
- assertNotNull(editPart6);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment1 = editPart6.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceDevicecontentsEditPart.VISUAL_ID));
- assertNotNull(compartment1);
-
- createNodeByTool(myArtifactTool, 201, 101);
-
- IGraphicalEditPart editPart7 = compartment1.getChildBySemanticHint(UMLVisualIDRegistry.getType(ArtifactEditPart.VISUAL_ID));
- assertNotNull(editPart7);
- assertEquals("Artifact", getMetaclassName(editPart7));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testArtifactInEnvironment() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool2;
- tool2 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.deploy.ExecutionEnvironment_2005")));
-
- createNodeByTool(tool2, 200, 100);
-
- IGraphicalEditPart editPart8 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentEditPart.VISUAL_ID));
- assertNotNull(editPart8);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment2 = editPart8.getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironmentArtifactsEditPart.VISUAL_ID));
- assertNotNull(compartment2);
-
- createNodeByTool(myArtifactTool, 201, 101);
-
- IGraphicalEditPart editPart9 = compartment2.getChildBySemanticHint(UMLVisualIDRegistry.getType(Artifact3EditPart.VISUAL_ID));
- assertNotNull(editPart9);
- assertEquals("Artifact", getMetaclassName(editPart9));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testDeviceInDevice() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool3;
- tool3 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.deploy.Device_2003")));
-
- createNodeByTool(tool3, 200, 100);
-
- IGraphicalEditPart editPart10 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceEditPart.VISUAL_ID));
- assertNotNull(editPart10);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment3 = editPart10.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceDevicecontentsEditPart.VISUAL_ID));
- assertNotNull(compartment3);
-
- createNodeByTool(myDeviceTool, 201, 150);
-
- IGraphicalEditPart editPart11 = compartment3.getChildBySemanticHint(UMLVisualIDRegistry.getType(Device2EditPart.VISUAL_ID));
- assertNotNull(editPart11);
- assertEquals("Device", getMetaclassName(editPart11));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testNodeInDevice() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool4;
- tool4 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.deploy.Device_2003")));
-
- createNodeByTool(tool4, 200, 100);
-
- IGraphicalEditPart editPart12 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceEditPart.VISUAL_ID));
- assertNotNull(editPart12);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment4 = editPart12.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceDevicecontentsEditPart.VISUAL_ID));
- assertNotNull(compartment4);
-
- createNodeByTool(myNodeTool, 201, 150);
-
- IGraphicalEditPart editPart13 = compartment4.getChildBySemanticHint(UMLVisualIDRegistry.getType(Node2EditPart.VISUAL_ID));
- assertNotNull(editPart13);
- assertEquals("Node", getMetaclassName(editPart13));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testEnvironmentInDevice() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool5;
- tool5 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.deploy.Device_2003")));
-
- createNodeByTool(tool5, 200, 100);
-
- IGraphicalEditPart editPart14 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceEditPart.VISUAL_ID));
- assertNotNull(editPart14);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment5 = editPart14.getChildBySemanticHint(UMLVisualIDRegistry.getType(DeviceDevicecontentsEditPart.VISUAL_ID));
- assertNotNull(compartment5);
-
- createNodeByTool(myEnvironmentTool, 201, 150);
-
- IGraphicalEditPart editPart15 = compartment5.getChildBySemanticHint(UMLVisualIDRegistry.getType(ExecutionEnvironment2EditPart.VISUAL_ID));
- assertNotNull(editPart15);
- assertEquals("ExecutionEnvironment", getMetaclassName(editPart15));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
-
- private static java.lang.String getMetaclassName(IGraphicalEditPart editPart) {
- return editPart.getNotationView().getElement().eClass().getName();
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/whole/TestWholeDeployDiagram.java b/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/whole/TestWholeDeployDiagram.java
deleted file mode 100644
index 9598dcf..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/whole/TestWholeDeployDiagram.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.uml2.diagram.deploy.tests.whole;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collections;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.uml2.diagram.common.wholediagram.TestWholeDiagram;
-import org.eclipse.uml2.diagram.common.wholediagram.UMLInitDiagramFacade;
-import org.eclipse.uml2.diagram.deploy.edit.parts.PackageEditPart;
-import org.eclipse.uml2.diagram.deploy.part.UMLDiagramEditor;
-import org.eclipse.uml2.diagram.deploy.part.UMLDiagramEditorPlugin;
-import org.osgi.framework.Bundle;
-
-public class TestWholeDeployDiagram extends TestWholeDiagram {
-
- public TestWholeDeployDiagram(String modelFileName, String diagramFileName) {
- super(modelFileName, diagramFileName);
- }
-
- @Override
- protected UMLInitDiagramFacade getInitDiagramFacade(IFile modelFile, IFile diagramFile) {
- return new UMLInitDiagramFacade(modelFile, diagramFile, UMLDiagramEditor.ID) {
-
- @Override
- protected Diagram createDiagramView(EObject modelRoot) {
- return ViewService.createDiagram(modelRoot, PackageEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
- }
-
- @Override
- public Diagram getDiagramView() throws ExecutionException, IOException, CoreException {
- Diagram result = super.getDiagramView();
-// diagram should be refresh when link to link exists.
- UMLInitDiagramFacade.refreshDiagram(result);
- return result;
- }
-
- };
- }
-
- @Override
- protected URL findFileInTestPlugin(String fileName) {
- return FileLocator.find(UML_TEST_BUNDLE, new Path(EXAMPLE_FOLDER).append(fileName), Collections.EMPTY_MAP);
- }
-
- @Override
- protected boolean ignoreView(int visualId) {
- return super.ignoreView(visualId);
- }
-
- private final static Bundle UML_TEST_BUNDLE = Platform.getBundle("org.eclipse.uml2.diagram.deploy.tests");
-
- private final static String EXAMPLE_FOLDER = "examples/";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/whole/TestWholeDiagramSuite.java b/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/whole/TestWholeDiagramSuite.java
deleted file mode 100644
index efb5f14..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/src/org/eclipse/uml2/diagram/deploy/tests/whole/TestWholeDiagramSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.uml2.diagram.deploy.tests.whole;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.uml2.diagram.deploy.tests.DeployDiagramFacade;
-
-import junit.framework.TestSuite;
-
-public class TestWholeDiagramSuite extends TestSuite {
-
- public TestWholeDiagramSuite() {
- for (String name : oursDiagramFiles) {
- addTest(new TestWholeDeployDiagram(name + ".uml", name + "." + DeployDiagramFacade.DIAGRAM_FILE_EXTENSION));
- }
-
- }
-
- private static List<String> oursDiagramFiles = new ArrayList<String>();
- static {
- oursDiagramFiles.add("Figure 10.13 - A DeploymentSpecification for an artifact");
- oursDiagramFiles.add("Figure 10.14 - Notation for a Device");
- oursDiagramFiles.add("Figure 10.17 - Communication path between two Node types with deployed Artifacts");
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.deploy.tests/test.xml b/tests/org.eclipse.uml2.diagram.deploy.tests/test.xml
deleted file mode 100644
index 072edfb..0000000
--- a/tests/org.eclipse.uml2.diagram.deploy.tests/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<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.uml2.diagram.usecase.tests"/>
- <property name="library-file" value="${eclipse-home}/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="uml2-tools-folder" value="${eclipse-home}/uml2_tools_folder"/>
- <delete dir="${uml2-tools-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${uml2-tools-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.uml2.diagram.usecase.tests.AllTests"/>
- <property name="vmargs" value="-ea -Xmx512M"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/.classpath b/tests/org.eclipse.uml2.diagram.profile.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/.cvsignore b/tests/org.eclipse.uml2.diagram.profile.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/.project b/tests/org.eclipse.uml2.diagram.profile.tests/.project
deleted file mode 100644
index 35df723..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.profile.tests</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/tests/org.eclipse.uml2.diagram.profile.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.diagram.profile.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index d9f09c4..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.profile.tests;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.emf.ecore,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.notation,
- org.eclipse.gmf.runtime.common.ui,
- org.junit,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.uml2.diagram.profile,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.uml2.diagram.common.tests
-Bundle-ClassPath: .
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/about.html b/tests/org.eclipse.uml2.diagram.profile.tests/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/tests/org.eclipse.uml2.diagram.profile.tests/build.properties b/tests/org.eclipse.uml2.diagram.profile.tests/build.properties
deleted file mode 100644
index 70e1688..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-jars.compile.order = .
-output.. = bin/
-source.. = src/
-
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- plugin.xml,\
- .,\
- test.xml,\
- examples/
-
-src.includes = about.html,\
- test.xml
-
-
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/examples/Ecore.profile.uml b/tests/org.eclipse.uml2.diagram.profile.tests/examples/Ecore.profile.uml
deleted file mode 100644
index 5b673d2..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/examples/Ecore.profile.uml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Profile xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" xmi:id="_C0xFYH_OEdufhfJBSJdKEg" metaclassReference="_5lluIH_PEdufhfJBSJdKEg">
- <elementImport xmi:id="_C0xFYX_OEdufhfJBSJdKEg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_C0xFYn_OEdufhfJBSJdKEg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_C0xFY3_OEdufhfJBSJdKEg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_C0xFZH_OEdufhfJBSJdKEg">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <elementImport xmi:id="_5lluIH_PEdufhfJBSJdKEg">
- <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- </elementImport>
- <packagedElement xmi:type="uml:Enumeration" xmi:id="_IJJwIH_OEdufhfJBSJdKEg" name="VisibilityKind">
- <ownedLiteral xmi:id="_QVeRUH_OEdufhfJBSJdKEg" name="Unspecified"/>
- <ownedLiteral xmi:id="_UJA0YH_OEdufhfJBSJdKEg" name="None"/>
- <ownedLiteral xmi:id="_VJSloH_OEdufhfJBSJdKEg" name="ReadOnly"/>
- <ownedLiteral xmi:id="_VtMj8H_OEdufhfJBSJdKEg" name="ReadWrite"/>
- <ownedLiteral xmi:id="_V42aUH_OEdufhfJBSJdKEg" name="ReadOnlyUnsettable"/>
- <ownedLiteral xmi:id="_WMDDIH_OEdufhfJBSJdKEg" name="ReadWriteUnsettable"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Enumeration" xmi:id="_lx5WoH_OEdufhfJBSJdKEg" name="FeatureKind">
- <ownedLiteral xmi:id="_nq5foH_OEdufhfJBSJdKEg" name="Unspecified"/>
- <ownedLiteral xmi:id="_roXawH_OEdufhfJBSJdKEg" name="Simple"/>
- <ownedLiteral xmi:id="_r2sxsH_OEdufhfJBSJdKEg" name="Attribute"/>
- <ownedLiteral xmi:id="_sAPvQH_OEdufhfJBSJdKEg" name="Element"/>
- <ownedLiteral xmi:id="_sKeCQH_OEdufhfJBSJdKEg" name="AttributeWildcard"/>
- <ownedLiteral xmi:id="_0py_AH_OEdufhfJBSJdKEg" name="ElementWildcard"/>
- <ownedLiteral xmi:id="_1HgOsH_OEdufhfJBSJdKEg" name="Group"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Stereotype" xmi:id="_8pI0IH_OEdufhfJBSJdKEg" name="EStructuralFeature">
- <ownedAttribute xmi:id="_Rrw5YH_PEdufhfJBSJdKEg" name="isTransient">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dDhb0H_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dDhb0X_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_R7btEH_PEdufhfJBSJdKEg" name="isVolatile">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_atexgH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_atexgX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_SD1bIH_PEdufhfJBSJdKEg" name="isUnsettable">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_fIp8UH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_fIp8UX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_SLqhcH_PEdufhfJBSJdKEg" name="xmlNamespace">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_gvCEQH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_gvCEQX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_SSKLAH_PEdufhfJBSJdKEg" name="xmlFeatureKind" type="_lx5WoH_OEdufhfJBSJdKEg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jWXS4H_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jWXS4X_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_mbM84H_PEdufhfJBSJdKEg" name="visibility" type="_IJJwIH_OEdufhfJBSJdKEg">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mtPvIH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mtPvIX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Stereotype" xmi:id="_AB11UH_PEdufhfJBSJdKEg" name="EAttribute">
- <generalization xmi:id="_C_mm8H_PEdufhfJBSJdKEg" general="_8pI0IH_OEdufhfJBSJdKEg"/>
- <ownedAttribute xmi:id="_uJooMH_PEdufhfJBSJdKEg" name="attributeName">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uWDTkH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uWDTkX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_wd80MH_PEdufhfJBSJdKEg" name="isID">
- <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wtz1IH_PEdufhfJBSJdKEg" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wtz1IX_PEdufhfJBSJdKEg"/>
- </ownedAttribute>
- <ownedAttribute xmi:id="_A4_qUH_QEdufhfJBSJdKEg" name="base_Property" association="_A45jsH_QEdufhfJBSJdKEg">
- <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Property"/>
- </ownedAttribute>
- </packagedElement>
- <packagedElement xmi:type="uml:Extension" xmi:id="_A45jsH_QEdufhfJBSJdKEg" name="Property_EAttribute" memberEnd="_A45jsX_QEdufhfJBSJdKEg _A4_qUH_QEdufhfJBSJdKEg">
- <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_A45jsX_QEdufhfJBSJdKEg" name="extension_EAttribute" type="_AB11UH_PEdufhfJBSJdKEg" aggregation="composite" association="_A45jsH_QEdufhfJBSJdKEg"/>
- </packagedElement>
-</uml:Profile>
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/examples/Ecore.umlprofile_diagram b/tests/org.eclipse.uml2.diagram.profile.tests/examples/Ecore.umlprofile_diagram
deleted file mode 100644
index be8265f..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/examples/Ecore.umlprofile_diagram
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.0/notation" xmlns:uml="http://www.eclipse.org/uml2/2.0.0/UML" xmi:id="_alkksOSCEduQ0thveFnwkA" type="UMLProfile" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_bCoUIOSCEduQ0thveFnwkA" type="2007">
- <children xmi:type="notation:Node" xmi:id="_bCoUJuSCEduQ0thveFnwkA" type="5009"/>
- <children xmi:type="notation:Node" xmi:id="_bCxeEOSCEduQ0thveFnwkA" type="7005">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_bCxeEeSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_bCxeEuSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_bCxeE-SCEduQ0thveFnwkA"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_bCoUIeSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_bCoUIuSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_bCoUI-SCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_bCoUJOSCEduQ0thveFnwkA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bCoUJeSCEduQ0thveFnwkA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_bCxeFOSCEduQ0thveFnwkA" type="2001">
- <children xmi:type="notation:Node" xmi:id="_bCxeGuSCEduQ0thveFnwkA" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_bCxeG-SCEduQ0thveFnwkA" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_bCxeHOSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_bCxeHeSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_bCxeHuSCEduQ0thveFnwkA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_bCxeH-SCEduQ0thveFnwkA" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_bCxeIOSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_bCxeIeSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_bCxeIuSCEduQ0thveFnwkA"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_bCxeFeSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_bCxeFuSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_bCxeF-SCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_bCxeGOSCEduQ0thveFnwkA"/>
- <element xmi:type="uml:Stereotype" href="Ecore.profile.uml#_8pI0IH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bCxeGeSCEduQ0thveFnwkA" x="120" y="24"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_bCxeI-SCEduQ0thveFnwkA" type="2001">
- <children xmi:type="notation:Node" xmi:id="_bCxeKeSCEduQ0thveFnwkA" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_bCxeKuSCEduQ0thveFnwkA" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_bCxeK-SCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_bCxeLOSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_bCxeLeSCEduQ0thveFnwkA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_bCxeLuSCEduQ0thveFnwkA" type="7002">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_bCxeL-SCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_bCxeMOSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_bCxeMeSCEduQ0thveFnwkA"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_bCxeJOSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_bCxeJeSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_bCxeJuSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_bCxeJ-SCEduQ0thveFnwkA"/>
- <element xmi:type="uml:Stereotype" href="Ecore.profile.uml#_AB11UH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bCxeKOSCEduQ0thveFnwkA" x="132" y="264"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_bCxeMuSCEduQ0thveFnwkA" type="2003">
- <children xmi:type="notation:Node" xmi:id="_bCxeOOSCEduQ0thveFnwkA" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_bCxeOeSCEduQ0thveFnwkA" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_bCxeOuSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_bCxeO-SCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_bCxePOSCEduQ0thveFnwkA"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_bCxeM-SCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_bCxeNOSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_bCxeNeSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_bCxeNuSCEduQ0thveFnwkA"/>
- <element xmi:type="uml:Enumeration" href="Ecore.profile.uml#_IJJwIH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bCxeN-SCEduQ0thveFnwkA" x="372" y="24"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_bCxePeSCEduQ0thveFnwkA" type="2003">
- <children xmi:type="notation:Node" xmi:id="_bC7PEOSCEduQ0thveFnwkA" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_bC7PEeSCEduQ0thveFnwkA" type="7004">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_bC7PEuSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_bC7PE-SCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_bC7PFOSCEduQ0thveFnwkA"/>
- </children>
- <styles xmi:type="notation:FontStyle" xmi:id="_bCxePuSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_bCxeP-SCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_bCxeQOSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_bCxeQeSCEduQ0thveFnwkA"/>
- <element xmi:type="uml:Enumeration" href="Ecore.profile.uml#_lx5WoH_OEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bCxeQuSCEduQ0thveFnwkA" x="578"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_bC7PFeSCEduQ0thveFnwkA" type="2006">
- <children xmi:type="notation:Node" xmi:id="_bC7PG-SCEduQ0thveFnwkA" type="5008"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_bC7PFuSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_bC7PF-SCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_bC7PGOSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_bC7PGeSCEduQ0thveFnwkA"/>
- <element xmi:type="uml:ElementImport" href="Ecore.profile.uml#_5lluIH_PEdufhfJBSJdKEg"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bC7PGuSCEduQ0thveFnwkA" x="408" y="276"/>
- </children>
- <styles xmi:type="notation:PageStyle" xmi:id="_alkkseSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:GuideStyle" xmi:id="_alkksuSCEduQ0thveFnwkA"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_alkks-SCEduQ0thveFnwkA"/>
- <element xmi:type="uml:Profile" href="Ecore.profile.uml#_C0xFYH_OEdufhfJBSJdKEg"/>
- <edges xmi:type="notation:Edge" xmi:id="_s0pncOSGEduBia6LmvPMxA" type="4001" source="_bCxeI-SCEduQ0thveFnwkA" target="_bCxeFOSCEduQ0thveFnwkA">
- <styles xmi:type="notation:RoutingStyle" xmi:id="_s0pnceSGEduBia6LmvPMxA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_s0pncuSGEduBia6LmvPMxA"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_s0pnc-SGEduBia6LmvPMxA"/>
- <element xmi:type="uml:Generalization" href="Ecore.profile.uml#_C_mm8H_PEdufhfJBSJdKEg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s0pndOSGEduBia6LmvPMxA" points="[7, -37, 0, 175]$[7, -115, 0, 97]$[7, -146, 0, 66]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_s0gdgOSGEduBia6LmvPMxA" type="4002" source="_bCxeI-SCEduQ0thveFnwkA" target="_bC7PFeSCEduQ0thveFnwkA">
- <children xmi:type="notation:Node" xmi:id="_s0gdhOSGEduBia6LmvPMxA" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_s0gdheSGEduBia6LmvPMxA" y="-15"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_s0gdgeSGEduBia6LmvPMxA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_s0gdguSGEduBia6LmvPMxA"/>
- <element xmi:type="uml:Extension" href="Ecore.profile.uml#_A45jsH_QEdufhfJBSJdKEg"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_s0gdg-SGEduBia6LmvPMxA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/plugin.properties b/tests/org.eclipse.uml2.diagram.profile.tests/plugin.properties
deleted file mode 100644
index 0bec910..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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=UML2 Profile Diagram Tests Plug-in (Incubation)
-providerName=Eclipse.org
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/plugin.xml b/tests/org.eclipse.uml2.diagram.profile.tests/plugin.xml
deleted file mode 100644
index 17ce305..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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:
- Tatiana Fesenko (Borland) - initial API and implementation
--->
-
-<plugin>
-</plugin>
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/AllNonUITests.java b/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/AllNonUITests.java
deleted file mode 100644
index 813ff21..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/AllNonUITests.java
+++ /dev/null
@@ -1,30 +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:
- * Michael Golubev (Borland) - initial API and implementation
- */
-
-package org.eclipse.uml2.diagram.profile.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.uml2.diagram.common.tests.FakeNonUITest;
-
-public class AllNonUITests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Headless tests for org.eclipse.uml2.diagram.clazz");
- //$JUnit-BEGIN$
- suite.addTest(new FakeNonUITest());
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/AllTests.java b/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/AllTests.java
deleted file mode 100644
index 45f5963..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/AllTests.java
+++ /dev/null
@@ -1,36 +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:
- * Michael Golubev (Borland) - initial API and implementation
- */
-
-package org.eclipse.uml2.diagram.profile.tests;
-
-import org.eclipse.uml2.diagram.profile.tests.palette.ProfileDPaletteEntriesSuite;
-import org.eclipse.uml2.diagram.profile.tests.sample.ProfileTestSampleSuite;
-import org.eclipse.uml2.diagram.profile.tests.tool.ProfileGroupTest;
-import org.eclipse.uml2.diagram.profile.tests.tool.UMLGroupTest;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.uml2.diagram.profile");
- //$JUnit-BEGIN$
- suite.addTest(new ProfileTestSampleSuite());
- suite.addTest(new ProfileDPaletteEntriesSuite());
- suite.addTestSuite(ProfileGroupTest.class);
- suite.addTestSuite(UMLGroupTest.class);
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/ProfileDiagramFacade.java b/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/ProfileDiagramFacade.java
deleted file mode 100644
index 13521ca..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/ProfileDiagramFacade.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.uml2.diagram.profile.tests;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.profile.part.UMLDiagramEditorUtil;
-
-public class ProfileDiagramFacade extends UMLDiagramFacade {
-
- public ProfileDiagramFacade(String path) {
- super(path, DIAGRAM_FILE_EXTENSION);
- }
-
- @Override
- protected Resource createDiagram(URI diagramModelURI, URI domainModelURI) {
- return UMLDiagramEditorUtil.createDiagram(diagramModelURI, domainModelURI, new NullProgressMonitor());
- }
-
- public static final String DIAGRAM_FILE_EXTENSION = "umlprofile_diagram";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/palette/ProfileDPaletteEntriesSuite.java b/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/palette/ProfileDPaletteEntriesSuite.java
deleted file mode 100644
index 4633b90..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/palette/ProfileDPaletteEntriesSuite.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.eclipse.uml2.diagram.profile.tests.palette;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.uml2.diagram.common.tests.palette.EntryExistenceTest;
-import org.eclipse.uml2.diagram.common.tests.palette.EntryLabelTest;
-import org.eclipse.uml2.diagram.profile.part.UMLPaletteFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-
-public class ProfileDPaletteEntriesSuite extends TestSuite {
- public ProfileDPaletteEntriesSuite() {
- super("PaletteEntriesSuite");
- PaletteRoot paletteRoot = new PaletteRoot();
- UMLPaletteFactory factory = new UMLPaletteFactory();
- factory.fillPalette(paletteRoot);
- List<List<ENamedElement>> paletteDescription = getPaletteDescrition();
- for (int groupIndex = 0; groupIndex < paletteDescription.size(); groupIndex++) {
- List<ENamedElement> entryDescriptions = paletteDescription.get(groupIndex);
- for (int entryIndex = 0; entryIndex < entryDescriptions.size(); entryIndex++) {
- addTest(new EntryExistenceTest(paletteRoot, groupIndex, entryDescriptions.get(entryIndex), entryIndex));
- addTest(new ProfileEntryMetaclassTest(paletteRoot, groupIndex, entryDescriptions.get(entryIndex), entryIndex));
- addTest(new EntryLabelTest(paletteRoot, groupIndex, entryDescriptions.get(entryIndex), entryIndex));
- }
- }
- }
- private static List<List<ENamedElement>> oursGroupDescription= new ArrayList<List<ENamedElement>>();
- private static List<ENamedElement> oursProfileGroupDescription= new ArrayList<ENamedElement>();
- private static List<ENamedElement> oursUMLGroupDescription= new ArrayList<ENamedElement>();
-
- static {
- oursGroupDescription.add(oursProfileGroupDescription);
- oursGroupDescription.add(oursUMLGroupDescription);
-
- oursProfileGroupDescription.add(UMLPackage.eINSTANCE.getProfile());
- oursProfileGroupDescription.add(UMLPackage.eINSTANCE.getStereotype());
- oursProfileGroupDescription.add(UMLPackage.eINSTANCE.getElementImport());
- oursProfileGroupDescription.add(UMLPackage.eINSTANCE.getExtension());
-
- oursUMLGroupDescription.add(UMLPackage.eINSTANCE.getEnumeration());
- oursUMLGroupDescription.add(UMLPackage.eINSTANCE.getGeneralization());
- oursUMLGroupDescription.add(UMLPackage.eINSTANCE.getProperty());
- oursUMLGroupDescription.add(UMLPackage.eINSTANCE.getConstraint());
- oursUMLGroupDescription.add(UMLPackage.eINSTANCE.getEnumerationLiteral());
- }
- protected List<List<ENamedElement>> getPaletteDescrition() {
- return oursGroupDescription;
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/palette/ProfileEntryMetaclassTest.java b/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/palette/ProfileEntryMetaclassTest.java
deleted file mode 100644
index b75d4de..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/palette/ProfileEntryMetaclassTest.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.uml2.diagram.profile.tests.palette;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.uml2.diagram.common.tests.palette.EntryMetaclassTest;
-import org.eclipse.uml2.diagram.profile.providers.UMLElementTypes;
-
-
-public class ProfileEntryMetaclassTest extends EntryMetaclassTest{
-
- public ProfileEntryMetaclassTest(PaletteRoot paletteRoot, int groupIndex, ENamedElement type, int entryIndex) {
- super(paletteRoot, groupIndex, type, entryIndex);
- // TODO Auto-generated constructor stub
- }
-
- @Override
- protected ENamedElement getElement(IAdaptable hint) {
- return UMLElementTypes.getElement(hint);
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/sample/ProfileSampleTest.java b/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/sample/ProfileSampleTest.java
deleted file mode 100644
index 2953397..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/sample/ProfileSampleTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.eclipse.uml2.diagram.profile.tests.sample;
-
-import java.net.URL;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.uml2.diagram.common.wholediagram.TestWholeDiagram;
-import org.eclipse.uml2.diagram.common.wholediagram.UMLInitDiagramFacade;
-import org.eclipse.uml2.diagram.profile.edit.parts.ProfileEditPart;
-import org.eclipse.uml2.diagram.profile.part.UMLDiagramEditor;
-import org.eclipse.uml2.diagram.profile.part.UMLDiagramEditorPlugin;
-import org.osgi.framework.Bundle;
-
-public class ProfileSampleTest extends TestWholeDiagram {
-
- public ProfileSampleTest(String modelFileName, String diagramFileName) {
- super(modelFileName, diagramFileName);
- }
-
- @Override
- protected UMLInitDiagramFacade getInitDiagramFacade(IFile modelFile, IFile diagramFile) {
- return new UMLInitDiagramFacade(modelFile, diagramFile, UMLDiagramEditor.ID) {
-
- @Override
- protected Diagram createDiagramView(EObject modelRoot) {
- return ViewService.createDiagram(modelRoot, ProfileEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
- }
-
- };
- }
-
- @Override
- protected URL findFileInTestPlugin(String fileName) {
- return FileLocator.find(UML_TEST_BUNDLE, new Path(EXAMPLE_FOLDER + fileName), Collections.EMPTY_MAP);
- }
-
- private final static Bundle UML_TEST_BUNDLE = Platform.getBundle("org.eclipse.uml2.diagram.profile.tests");
-
- private final static String EXAMPLE_FOLDER = "examples/";
-}
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/sample/ProfileTestSampleSuite.java b/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/sample/ProfileTestSampleSuite.java
deleted file mode 100644
index 251654f..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/sample/ProfileTestSampleSuite.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.uml2.diagram.profile.tests.sample;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-
-public class ProfileTestSampleSuite extends TestSuite {
- public ProfileTestSampleSuite() {
- for (String name: oursDiagramFiles) {
- addTest(new ProfileSampleTest(name + ".profile.uml", name + ".umlprofile_diagram"));
- }
-
- }
- private static List<String> oursDiagramFiles = new ArrayList<String>();
- static {
- oursDiagramFiles.add("Ecore");
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/tool/ProfileDCreationToolTestBase.java b/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/tool/ProfileDCreationToolTestBase.java
deleted file mode 100644
index 58d134d..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/tool/ProfileDCreationToolTestBase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.uml2.diagram.profile.tests.tool;
-
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.common.tool.CreationToolTestBase;
-
-public class ProfileDCreationToolTestBase extends CreationToolTestBase {
-
- public ProfileDCreationToolTestBase(String name) {
- super(name);
- }
-
- @Override
- protected UMLDiagramFacade getDiagram(String projectPath) {
- return new org.eclipse.uml2.diagram.profile.tests.ProfileDiagramFacade(projectPath);
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/tool/ProfileGroupTest.java b/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/tool/ProfileGroupTest.java
deleted file mode 100644
index e26ee0b..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/tool/ProfileGroupTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.uml2.diagram.profile.tests.tool;
-
-import java.util.Collections;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.uml2.diagram.profile.edit.parts.ElementImportEditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.Profile2EditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.ProfileContentsEditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.Stereotype2EditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.StereotypeEditPart;
-import org.eclipse.uml2.diagram.profile.part.UMLPaletteFactory;
-import org.eclipse.uml2.diagram.profile.part.UMLVisualIDRegistry;
-
-public class ProfileGroupTest extends ProfileDCreationToolTestBase {
-
- /**
- * @generated
- */
- PaletteRoot myRoot;
-
- /**
- * @generated
- */
- Tool myProfileTool;
-
- /**
- * @generated
- */
- Tool myStereotypeTool;
-
- /**
- * @generated
- */
- Tool myMetaclassTool;
-
- /**
- * @generated
- */
- Tool myExtensionTool;
-
- /**
- * @generated
- */
- protected void setUp() throws Exception {
- super.setUp();
- myRoot = new PaletteRoot();
- new UMLPaletteFactory().fillPalette(myRoot);
- myProfileTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(0)).createTool();
- myStereotypeTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(1)).createTool();
- myMetaclassTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(2)).createTool();
- myExtensionTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(3)).createTool();
- }
-
- /**
- * @generated
- */
- protected void tearDown() throws Exception {
- myRoot = null;
- myProfileTool = null;
- myStereotypeTool = null;
- myMetaclassTool = null;
- myExtensionTool = null;
-
- super.tearDown();
- }
-
- /**
- * @generated
- */
- public ProfileGroupTest(String name) {
- super(name);
- }
-
- /**
- * @generated
- */
- public void testProfileOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myProfileTool, 200, 100);
-
- IGraphicalEditPart editPart1 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Profile2EditPart.VISUAL_ID));
- assertNotNull(editPart1);
- assertEquals("Profile", getMetaclassName(editPart1));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testStereotypeOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myStereotypeTool, 200, 100);
-
- IGraphicalEditPart editPart2 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(StereotypeEditPart.VISUAL_ID));
- assertNotNull(editPart2);
- assertEquals("Stereotype", getMetaclassName(editPart2));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testMetaclassOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myMetaclassTool, 200, 100);
-
- IGraphicalEditPart editPart3 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ElementImportEditPart.VISUAL_ID));
- assertNotNull(editPart3);
- assertEquals("ElementImport", getMetaclassName(editPart3));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testStereotypeInProfile() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool1;
- tool1 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.profile.Profile_2002")));
-
- createNodeByTool(tool1, 200, 100);
-
- IGraphicalEditPart editPart4 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Profile2EditPart.VISUAL_ID));
- assertNotNull(editPart4);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment1 = editPart4.getChildBySemanticHint(UMLVisualIDRegistry.getType(ProfileContentsEditPart.VISUAL_ID));
- assertNotNull(compartment1);
-
- createNodeByTool(myStereotypeTool, 200, 100);
-
- IGraphicalEditPart editPart5 = compartment1.getChildBySemanticHint(UMLVisualIDRegistry.getType(Stereotype2EditPart.VISUAL_ID));
- assertNotNull(editPart5);
- assertEquals("Stereotype", getMetaclassName(editPart5));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
-
- private static java.lang.String getMetaclassName(IGraphicalEditPart editPart) {
- return editPart.getNotationView().getElement().eClass().getName();
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/tool/UMLGroupTest.java b/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/tool/UMLGroupTest.java
deleted file mode 100644
index abfba29..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/src/org/eclipse/uml2/diagram/profile/tests/tool/UMLGroupTest.java
+++ /dev/null
@@ -1,231 +0,0 @@
-package org.eclipse.uml2.diagram.profile.tests.tool;
-
-import java.util.Collections;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.uml2.diagram.profile.edit.parts.ConstraintEditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.ElementImport2EditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.EnumerationEditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.EnumerationLiteralEditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.EnumerationLiteralsEditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.Profile3EditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.ProfileProfileLabelsEditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.PropertyEditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.StereotypeAttributesEditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.StereotypeConstraintsEditPart;
-import org.eclipse.uml2.diagram.profile.edit.parts.StereotypeEditPart;
-import org.eclipse.uml2.diagram.profile.part.UMLPaletteFactory;
-import org.eclipse.uml2.diagram.profile.part.UMLVisualIDRegistry;
-
-public class UMLGroupTest extends ProfileDCreationToolTestBase {
-
- /**
- * @generated
- */
- PaletteRoot myRoot;
-
- /**
- * @generated
- */
- Tool myEnumerationTool;
-
- /**
- * @generated
- */
- Tool myGeneralizationTool;
-
- /**
- * @generated
- */
- Tool myPropertyTool;
-
- /**
- * @generated
- */
- Tool myConstraintTool;
-
- /**
- * @generated
- */
- Tool myLiteralTool;
-
- /**
- * @generated
- */
- Tool myElementImportTool;
-
- /**
- * @generated
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- myRoot = new PaletteRoot();
- new UMLPaletteFactory().fillPalette(myRoot);
- myEnumerationTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(0)).createTool();
- myGeneralizationTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(1)).createTool();
- myPropertyTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(2)).createTool();
- myConstraintTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(3)).createTool();
- myLiteralTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(4)).createTool();
- myElementImportTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(5)).createTool();
- }
-
- /**
- * @generated
- */
- @Override
- protected void tearDown() throws Exception {
- myRoot = null;
- myEnumerationTool = null;
- myGeneralizationTool = null;
- myPropertyTool = null;
- myConstraintTool = null;
- myLiteralTool = null;
- myElementImportTool = null;
-
- super.tearDown();
- }
-
- /**
- * @generated
- */
- public UMLGroupTest(String name) {
- super(name);
- }
-
- /**
- * @generated
- */
- public void testEnumerationOnDiagram() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myEnumerationTool, 200, 100);
-
- IGraphicalEditPart editPart1 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEditPart.VISUAL_ID));
- assertNotNull(editPart1);
- assertEquals("Enumeration", getMetaclassName(editPart1));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPropertyInStereotype() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool1;
- tool1 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.profile.Stereotype_2001")));
-
- createNodeByTool(tool1, 200, 100);
-
- IGraphicalEditPart editPart2 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(StereotypeEditPart.VISUAL_ID));
- assertNotNull(editPart2);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment1 = editPart2.getChildBySemanticHint(UMLVisualIDRegistry.getType(StereotypeAttributesEditPart.VISUAL_ID));
- assertNotNull(compartment1);
-
- createNodeByTool(myPropertyTool, 201, 101);
-
- IGraphicalEditPart editPart3 = compartment1.getChildBySemanticHint(UMLVisualIDRegistry.getType(PropertyEditPart.VISUAL_ID));
- assertNotNull(editPart3);
- assertEquals("Property", getMetaclassName(editPart3));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testConstraintInStereotype() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool2;
- tool2 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.profile.Stereotype_2001")));
-
- createNodeByTool(tool2, 200, 100);
-
- IGraphicalEditPart editPart4 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(StereotypeEditPart.VISUAL_ID));
- assertNotNull(editPart4);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment2 = editPart4.getChildBySemanticHint(UMLVisualIDRegistry.getType(StereotypeConstraintsEditPart.VISUAL_ID));
- assertNotNull(compartment2);
-
- createNodeByTool(myConstraintTool, 201, 101);
-
- IGraphicalEditPart editPart5 = compartment2.getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintEditPart.VISUAL_ID));
- assertNotNull(editPart5);
- assertEquals("Constraint", getMetaclassName(editPart5));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testEnumerationLiteralInEnumeration() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- Tool tool3;
- tool3 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.profile.Enumeration_2003")));
-
- createNodeByTool(tool3, 200, 100);
-
- IGraphicalEditPart editPart6 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationEditPart.VISUAL_ID));
- assertNotNull(editPart6);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment3 = editPart6.getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationLiteralsEditPart.VISUAL_ID));
- assertNotNull(compartment3);
-
- createNodeByTool(myLiteralTool, 200, 100);
-
- IGraphicalEditPart editPart7 = compartment3.getChildBySemanticHint(UMLVisualIDRegistry.getType(EnumerationLiteralEditPart.VISUAL_ID));
- assertNotNull(editPart7);
- assertEquals("EnumerationLiteral", getMetaclassName(editPart7));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testElementImport() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- IGraphicalEditPart editPart8 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Profile3EditPart.VISUAL_ID));
- assertNotNull(editPart8);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment4 = editPart8.getChildBySemanticHint(UMLVisualIDRegistry.getType(ProfileProfileLabelsEditPart.VISUAL_ID));
- assertNotNull(compartment4);
-
- createNodeByTool(myElementImportTool, 200, 100);
-
- IGraphicalEditPart editPart9 = compartment4.getChildBySemanticHint(UMLVisualIDRegistry.getType(ElementImport2EditPart.VISUAL_ID));
- assertNotNull(editPart9);
- assertEquals("ElementImport", getMetaclassName(editPart9));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
-
- private static java.lang.String getMetaclassName(IGraphicalEditPart editPart) {
- return editPart.getNotationView().getElement().eClass().getName();
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.profile.tests/test.xml b/tests/org.eclipse.uml2.diagram.profile.tests/test.xml
deleted file mode 100644
index 03e27c3..0000000
--- a/tests/org.eclipse.uml2.diagram.profile.tests/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<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.uml2.diagram.profile.tests"/>
- <property name="library-file" value="${eclipse-home}/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="uml2-tools-folder" value="${eclipse-home}/uml2_tools_folder"/>
- <delete dir="${uml2-tools-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${uml2-tools-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.uml2.diagram.profile.tests.AllNonUITests"/>
- <property name="vmargs" value="-ea -Xmx512M"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/.classpath b/tests/org.eclipse.uml2.diagram.statemachine.tests/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/.cvsignore b/tests/org.eclipse.uml2.diagram.statemachine.tests/.cvsignore
deleted file mode 100644
index 0a6154d..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-org.eclipse.uml2.diagram.clazz.tests.jar
\ No newline at end of file
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/.project b/tests/org.eclipse.uml2.diagram.statemachine.tests/.project
deleted file mode 100644
index a4b81f0..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.statemachine.tests</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/tests/org.eclipse.uml2.diagram.statemachine.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.diagram.statemachine.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index cb35b17..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.statemachine.tests;singleton:=true
-Bundle-Version: 0.8.0.qualifier
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.core.runtime,
- org.junit,
- org.eclipse.uml2.diagram.statemachine,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.uml2.diagram.common.tests
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/about.html b/tests/org.eclipse.uml2.diagram.statemachine.tests/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/tests/org.eclipse.uml2.diagram.statemachine.tests/build.properties b/tests/org.eclipse.uml2.diagram.statemachine.tests/build.properties
deleted file mode 100644
index 70e1688..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-jars.compile.order = .
-output.. = bin/
-source.. = src/
-
-bin.includes = META-INF/,\
- about.html,\
- plugin.properties,\
- plugin.xml,\
- .,\
- test.xml,\
- examples/
-
-src.includes = about.html,\
- test.xml
-
-
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.22.Junction.uml b/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.22.Junction.uml
deleted file mode 100644
index dd28958..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.22.Junction.uml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:StateMachine xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_2lNDMBZlEdyzvZTv-3508A" name="StateMachine">
- <region xmi:id="_54XdEBZlEdyzvZTv-3508A">
- <subvertex xmi:type="uml:State" xmi:id="_6zFY4BZlEdyzvZTv-3508A" name="State0"/>
- <subvertex xmi:type="uml:State" xmi:id="_8XE7MBZlEdyzvZTv-3508A" name="State1"/>
- <subvertex xmi:type="uml:State" xmi:id="_9wWbQBZlEdyzvZTv-3508A" name="State2"/>
- <subvertex xmi:type="uml:State" xmi:id="_-uCykBZlEdyzvZTv-3508A" name="State3"/>
- <subvertex xmi:type="uml:State" xmi:id="__jZGMBZlEdyzvZTv-3508A" name="State4"/>
- <subvertex xmi:type="uml:Pseudostate" xmi:id="_FG0SgBZmEdyzvZTv-3508A" kind="junction"/>
- <transition xmi:id="_GktM0BZmEdyzvZTv-3508A" guard="_TttN8BZnEdyHc83xjr4kXQ" target="_FG0SgBZmEdyzvZTv-3508A" source="_6zFY4BZlEdyzvZTv-3508A">
- <ownedRule xmi:id="_TttN8BZnEdyHc83xjr4kXQ" name="guard">
- <specification xmi:type="uml:LiteralString" xmi:id="_VbYQsBZnEdyHc83xjr4kXQ" name="specification" value="b < 0"/>
- </ownedRule>
- <trigger xmi:id="_MzV5UBZmEdyzvZTv-3508A" name="trigger">
- <event xmi:type="uml:AnyReceiveEvent" href="events.uml#_YuTE4BZlEdyzvZTv-3508A"/>
- </trigger>
- </transition>
- <transition xmi:id="_HH4LUBZmEdyzvZTv-3508A" guard="_ZoNdgBZnEdyHc83xjr4kXQ" target="_FG0SgBZmEdyzvZTv-3508A" source="_8XE7MBZlEdyzvZTv-3508A">
- <ownedRule xmi:id="_ZoNdgBZnEdyHc83xjr4kXQ" name="guard">
- <specification xmi:type="uml:LiteralString" xmi:id="_bs1nsBZnEdyHc83xjr4kXQ" name="specification" value="b < 0"/>
- </ownedRule>
- <trigger xmi:id="_5nhIMBZmEdyhHZ9nvoKReg" name="trigger">
- <event xmi:type="uml:AnyReceiveEvent" href="events.uml#_X2t8oBZlEdyzvZTv-3508A"/>
- </trigger>
- </transition>
- <transition xmi:id="_IPQqIBZmEdyzvZTv-3508A" guard="_phjUwBZnEdyHc83xjr4kXQ" target="_-uCykBZlEdyzvZTv-3508A" source="_FG0SgBZmEdyzvZTv-3508A">
- <ownedRule xmi:id="_phjUwBZnEdyHc83xjr4kXQ" name="guard">
- <specification xmi:type="uml:LiteralString" xmi:id="_tYUyABZnEdyHc83xjr4kXQ" name="specification" value="a = 5"/>
- </ownedRule>
- </transition>
- <transition xmi:id="_JC9_ABZmEdyzvZTv-3508A" guard="_xYe0wBZnEdyHc83xjr4kXQ" target="__jZGMBZlEdyzvZTv-3508A" source="_FG0SgBZmEdyzvZTv-3508A">
- <ownedRule xmi:id="_xYe0wBZnEdyHc83xjr4kXQ" name="guard">
- <specification xmi:type="uml:LiteralString" xmi:id="_y5MZkBZnEdyHc83xjr4kXQ" name="specification" value="a > 7"/>
- </ownedRule>
- </transition>
- <transition xmi:id="_Jz2CUBZmEdyzvZTv-3508A" guard="_j0UFIBZnEdyHc83xjr4kXQ" target="_9wWbQBZlEdyzvZTv-3508A" source="_FG0SgBZmEdyzvZTv-3508A">
- <ownedRule xmi:id="_j0UFIBZnEdyHc83xjr4kXQ" name="guard">
- <specification xmi:type="uml:LiteralString" xmi:id="_lV6awBZnEdyHc83xjr4kXQ" name="specification" value="a < 0"/>
- </ownedRule>
- </transition>
- </region>
-</uml:StateMachine>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.22.Junction.umlstatemachine_diagram b/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.22.Junction.umlstatemachine_diagram
deleted file mode 100644
index 136b9e0..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.22.Junction.umlstatemachine_diagram
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_2lf-IBZlEdyzvZTv-3508A" type="UMLStateMachine" name="15.22.Junction.umlstatemachine_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_2nI84BZlEdyzvZTv-3508A" type="2004">
- <children xmi:type="notation:Node" xmi:id="_2nI84xZlEdyzvZTv-3508A" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_54hOEBZlEdyzvZTv-3508A" type="3013">
- <children xmi:type="notation:Node" xmi:id="_5496ABZlEdyzvZTv-3508A" type="7004">
- <children xmi:type="notation:Node" xmi:id="_65C28BZlEdyzvZTv-3508A" type="3001">
- <children xmi:type="notation:Node" xmi:id="_65yd0BZlEdyzvZTv-3508A" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_65C28RZlEdyzvZTv-3508A"/>
- <element xmi:type="uml:State" href="15.22.Junction.uml#_6zFY4BZlEdyzvZTv-3508A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_65C28hZlEdyzvZTv-3508A" x="103" y="21"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_8X0iEBZlEdyzvZTv-3508A" type="3001">
- <children xmi:type="notation:Node" xmi:id="_8X0iExZlEdyzvZTv-3508A" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_8X0iERZlEdyzvZTv-3508A"/>
- <element xmi:type="uml:State" href="15.22.Junction.uml#_8XE7MBZlEdyzvZTv-3508A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8X0iEhZlEdyzvZTv-3508A" x="379" y="21"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_9w8RIBZlEdyzvZTv-3508A" type="3001">
- <children xmi:type="notation:Node" xmi:id="_9w8RIxZlEdyzvZTv-3508A" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_9w8RIRZlEdyzvZTv-3508A"/>
- <element xmi:type="uml:State" href="15.22.Junction.uml#_9wWbQBZlEdyzvZTv-3508A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9w8RIhZlEdyzvZTv-3508A" x="33" y="283"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_-uVtgBZlEdyzvZTv-3508A" type="3001">
- <children xmi:type="notation:Node" xmi:id="_-uVtgxZlEdyzvZTv-3508A" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_-uVtgRZlEdyzvZTv-3508A"/>
- <element xmi:type="uml:State" href="15.22.Junction.uml#_-uCykBZlEdyzvZTv-3508A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-uVtghZlEdyzvZTv-3508A" x="241" y="283"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__j1yIBZlEdyzvZTv-3508A" type="3001">
- <children xmi:type="notation:Node" xmi:id="__j1yIxZlEdyzvZTv-3508A" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__j1yIRZlEdyzvZTv-3508A"/>
- <element xmi:type="uml:State" href="15.22.Junction.uml#__jZGMBZlEdyzvZTv-3508A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__j1yIhZlEdyzvZTv-3508A" x="470" y="283"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_FG0SgRZmEdyzvZTv-3508A" type="3009">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_FG0SghZmEdyzvZTv-3508A"/>
- <element xmi:type="uml:Pseudostate" href="15.22.Junction.uml#_FG0SgBZmEdyzvZTv-3508A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FG0SgxZmEdyzvZTv-3508A" x="256" y="135"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_5496ARZlEdyzvZTv-3508A"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_5496AhZlEdyzvZTv-3508A"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_54hOERZlEdyzvZTv-3508A"/>
- <element xmi:type="uml:Region" href="15.22.Junction.uml#_54XdEBZlEdyzvZTv-3508A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_54hOEhZlEdyzvZTv-3508A"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_2nI84RZlEdyzvZTv-3508A"/>
- <element xmi:type="uml:StateMachine" href="15.22.Junction.uml#_2lNDMBZlEdyzvZTv-3508A"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2nI84hZlEdyzvZTv-3508A"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_2lf-IRZlEdyzvZTv-3508A"/>
- <element xmi:type="uml:StateMachine" href="15.22.Junction.uml#_2lNDMBZlEdyzvZTv-3508A"/>
- <edges xmi:type="notation:Edge" xmi:id="_GktM0RZmEdyzvZTv-3508A" type="4001" source="_65C28BZlEdyzvZTv-3508A" target="_FG0SgRZmEdyzvZTv-3508A">
- <children xmi:type="notation:Node" xmi:id="_Gk2WwBZmEdyzvZTv-3508A" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Gk2WwRZmEdyzvZTv-3508A" x="-68" y="32"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_GktM0hZmEdyzvZTv-3508A"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_GktM0xZmEdyzvZTv-3508A"/>
- <element xmi:type="uml:Transition" href="15.22.Junction.uml#_GktM0BZmEdyzvZTv-3508A"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GktM1BZmEdyzvZTv-3508A" points="[18, 15, -112, -91]$[123, 105, -7, -1]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_HIBVQBZmEdyzvZTv-3508A" type="4001" source="_8X0iEBZlEdyzvZTv-3508A" target="_FG0SgRZmEdyzvZTv-3508A">
- <children xmi:type="notation:Node" xmi:id="_HIBVRBZmEdyzvZTv-3508A" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_HIBVRRZmEdyzvZTv-3508A" x="-76" y="-33"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_HIBVQRZmEdyzvZTv-3508A"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_HIBVQhZmEdyzvZTv-3508A"/>
- <element xmi:type="uml:Transition" href="15.22.Junction.uml#_HH4LUBZmEdyzvZTv-3508A"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HIBVQxZmEdyzvZTv-3508A" points="[-21, 15, 129, -90]$[-153, 104, -3, -1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HIBVRhZmEdyzvZTv-3508A" id="(0.2,0.4)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_IPQqIRZmEdyzvZTv-3508A" type="4001" source="_FG0SgRZmEdyzvZTv-3508A" target="_-uVtgBZlEdyzvZTv-3508A">
- <children xmi:type="notation:Node" xmi:id="_IPQqJRZmEdyzvZTv-3508A" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_IPQqJhZmEdyzvZTv-3508A" x="27" y="33"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_IPQqIhZmEdyzvZTv-3508A"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_IPQqIxZmEdyzvZTv-3508A"/>
- <element xmi:type="uml:Transition" href="15.22.Junction.uml#_IPQqIBZmEdyzvZTv-3508A"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IPQqJBZmEdyzvZTv-3508A" points="[3, 3, 0, -139]$[3, 136, 0, -6]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IPZ0EBZmEdyzvZTv-3508A" id="(0.33333334,0.8)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IPZ0ERZmEdyzvZTv-3508A" id="(0.5,0.2)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_JC9_ARZmEdyzvZTv-3508A" type="4001" source="_FG0SgRZmEdyzvZTv-3508A" target="__j1yIBZlEdyzvZTv-3508A">
- <children xmi:type="notation:Node" xmi:id="_JC9_BRZmEdyzvZTv-3508A" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JC9_BhZmEdyzvZTv-3508A" x="35" y="-29"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_JC9_AhZmEdyzvZTv-3508A"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_JC9_AxZmEdyzvZTv-3508A"/>
- <element xmi:type="uml:Transition" href="15.22.Junction.uml#_JC9_ABZmEdyzvZTv-3508A"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JC9_BBZmEdyzvZTv-3508A" points="[8, 5, -224, -138]$[231, 141, -1, -2]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JC9_BxZmEdyzvZTv-3508A" id="(0.41666666,0.06666667)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Jz2CURZmEdyzvZTv-3508A" type="4001" source="_FG0SgRZmEdyzvZTv-3508A" target="_9w8RIBZlEdyzvZTv-3508A">
- <children xmi:type="notation:Node" xmi:id="_Jz2CVRZmEdyzvZTv-3508A" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Jz2CVhZmEdyzvZTv-3508A" x="29" y="27"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_Jz2CUhZmEdyzvZTv-3508A"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Jz2CUxZmEdyzvZTv-3508A"/>
- <element xmi:type="uml:Transition" href="15.22.Junction.uml#_Jz2CUBZmEdyzvZTv-3508A"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Jz2CVBZmEdyzvZTv-3508A" points="[-2, 2, 188, -142]$[-189, 142, 1, -2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Jz_zUBZmEdyzvZTv-3508A" id="(0.13333334,0.4)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Jz_zURZmEdyzvZTv-3508A" id="(0.5833333,0.06666667)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.25.Fork and Join.uml b/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.25.Fork and Join.uml
deleted file mode 100644
index 266d568..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.25.Fork and Join.uml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:StateMachine xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_MTl9wAkqEdyF_oRbgI8ypA" name="StateMachine">
- <region xmi:id="_cWXd0AkqEdyF_oRbgI8ypA">
- <subvertex xmi:type="uml:State" xmi:id="_dQx3oAkqEdyF_oRbgI8ypA" name="Setup"/>
- <subvertex xmi:type="uml:State" xmi:id="_gLofMAkqEdyF_oRbgI8ypA" name="Process">
- <region xmi:id="_gMEkEAkqEdyF_oRbgI8ypA" name="Region">
- <subvertex xmi:type="uml:State" xmi:id="_kLK24AkqEdyF_oRbgI8ypA" name="A1"/>
- <subvertex xmi:type="uml:State" xmi:id="_k7v_QAkqEdyF_oRbgI8ypA" name="A2"/>
- <transition xmi:id="_1Ihv4AkqEdyF_oRbgI8ypA" target="_k7v_QAkqEdyF_oRbgI8ypA" source="_kLK24AkqEdyF_oRbgI8ypA"/>
- <transition xmi:id="_4pOPcAkqEdyF_oRbgI8ypA" target="_tRx2EAkqEdyF_oRbgI8ypA" source="_k7v_QAkqEdyF_oRbgI8ypA"/>
- </region>
- <region xmi:id="_hWIjcAkqEdyF_oRbgI8ypA">
- <subvertex xmi:type="uml:State" xmi:id="_nQ54wAkqEdyF_oRbgI8ypA" name="B1"/>
- <subvertex xmi:type="uml:State" xmi:id="_oCqs4AkqEdyF_oRbgI8ypA" name="B2"/>
- <transition xmi:id="_2IJZ0AkqEdyF_oRbgI8ypA" target="_oCqs4AkqEdyF_oRbgI8ypA" source="_nQ54wAkqEdyF_oRbgI8ypA"/>
- <transition xmi:id="_3VL0sAkqEdyF_oRbgI8ypA" target="_tRx2EAkqEdyF_oRbgI8ypA" source="_oCqs4AkqEdyF_oRbgI8ypA"/>
- </region>
- </subvertex>
- <subvertex xmi:type="uml:State" xmi:id="_rfWPIAkqEdyF_oRbgI8ypA" name="Cleanup"/>
- <subvertex xmi:type="uml:Pseudostate" xmi:id="_s0SBwAkqEdyF_oRbgI8ypA" kind="fork"/>
- <subvertex xmi:type="uml:Pseudostate" xmi:id="_tRx2EAkqEdyF_oRbgI8ypA" kind="join"/>
- <transition xmi:id="_zn98EAkqEdyF_oRbgI8ypA" target="_s0SBwAkqEdyF_oRbgI8ypA" source="_dQx3oAkqEdyF_oRbgI8ypA"/>
- <transition xmi:id="_6KOIIAkqEdyF_oRbgI8ypA" target="_rfWPIAkqEdyF_oRbgI8ypA" source="_tRx2EAkqEdyF_oRbgI8ypA"/>
- <transition xmi:id="_F0JYoAkrEdyF_oRbgI8ypA" target="_kLK24AkqEdyF_oRbgI8ypA" source="_s0SBwAkqEdyF_oRbgI8ypA"/>
- <transition xmi:id="_Gg_3kAkrEdyF_oRbgI8ypA" target="_nQ54wAkqEdyF_oRbgI8ypA" source="_s0SBwAkqEdyF_oRbgI8ypA"/>
- </region>
-</uml:StateMachine>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.25.Fork and Join.umlstatemachine_diagram b/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.25.Fork and Join.umlstatemachine_diagram
deleted file mode 100644
index 9645fd2..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.25.Fork and Join.umlstatemachine_diagram
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_MT44sAkqEdyF_oRbgI8ypA" type="UMLStateMachine" name="15.25.Fork and Join.umlstatemachine_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_MV0yYAkqEdyF_oRbgI8ypA" type="2004">
- <children xmi:type="notation:Node" xmi:id="_MV0yYwkqEdyF_oRbgI8ypA" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_cWhO0AkqEdyF_oRbgI8ypA" type="3013">
- <children xmi:type="notation:Node" xmi:id="_cWqYwAkqEdyF_oRbgI8ypA" type="7004">
- <children xmi:type="notation:Node" xmi:id="_dSRFYAkqEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_dSRFYwkqEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_dSRFYQkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.25.Fork and Join.uml#_dQx3oAkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dSRFYgkqEdyF_oRbgI8ypA" x="31" y="93"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_gMhQAAkqEdyF_oRbgI8ypA" type="3012">
- <children xmi:type="notation:Node" xmi:id="_gMhQAwkqEdyF_oRbgI8ypA" type="5004"/>
- <children xmi:type="notation:Node" xmi:id="_gM0yAAkqEdyF_oRbgI8ypA" type="3002">
- <children xmi:type="notation:Node" xmi:id="_gM0yAwkqEdyF_oRbgI8ypA" type="7003">
- <children xmi:type="notation:Node" xmi:id="_kLdx0AkqEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_kLdx0wkqEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_kLdx0QkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.25.Fork and Join.uml#_kLK24AkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kLdx0gkqEdyF_oRbgI8ypA" x="13" y="9"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_k8C6MAkqEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_k8C6MwkqEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_k8C6MQkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.25.Fork and Join.uml#_k7v_QAkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_k8C6MgkqEdyF_oRbgI8ypA" x="149" y="10"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_gM0yBAkqEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_gM0yBQkqEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_gM0yAQkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Region" href="15.25.Fork and Join.uml#_gMEkEAkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gM0yAgkqEdyF_oRbgI8ypA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_hWIjcQkqEdyF_oRbgI8ypA" type="3002">
- <children xmi:type="notation:Node" xmi:id="_hWIjdAkqEdyF_oRbgI8ypA" type="7003">
- <children xmi:type="notation:Node" xmi:id="_nRMzsAkqEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_nRMzswkqEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_nRMzsQkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.25.Fork and Join.uml#_nQ54wAkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_nRMzsgkqEdyF_oRbgI8ypA" x="17" y="4"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_oC0d4AkqEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_oC0d4wkqEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_oC0d4QkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.25.Fork and Join.uml#_oCqs4AkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_oC0d4gkqEdyF_oRbgI8ypA" x="152" y="5"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_hWIjdQkqEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_hWIjdgkqEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_hWIjcgkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Region" href="15.25.Fork and Join.uml#_hWIjcAkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hWIjcwkqEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_gMhQAQkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.25.Fork and Join.uml#_gLofMAkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gMhQAgkqEdyF_oRbgI8ypA" x="175" y="33" width="236" height="141"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_rfpKEAkqEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_rfpKEwkqEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_rfpKEQkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.25.Fork and Join.uml#_rfWPIAkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rfpKEgkqEdyF_oRbgI8ypA" x="499" y="93"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_s0SBwQkqEdyF_oRbgI8ypA" type="3007">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_s0SBwgkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Pseudostate" href="15.25.Fork and Join.uml#_s0SBwAkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_s0SBwwkqEdyF_oRbgI8ypA" x="127" y="88"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_tR7nEAkqEdyF_oRbgI8ypA" type="3008">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_tR7nEQkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Pseudostate" href="15.25.Fork and Join.uml#_tRx2EAkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tR7nEgkqEdyF_oRbgI8ypA" x="463" y="88"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_cWqYwQkqEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_cWqYwgkqEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_cWhO0QkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Region" href="15.25.Fork and Join.uml#_cWXd0AkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cWhO0gkqEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_MV0yYQkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:StateMachine" href="15.25.Fork and Join.uml#_MTl9wAkqEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MV0yYgkqEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_MT44sQkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:StateMachine" href="15.25.Fork and Join.uml#_MTl9wAkqEdyF_oRbgI8ypA"/>
- <edges xmi:type="notation:Edge" xmi:id="_zoHtEAkqEdyF_oRbgI8ypA" type="4001" source="_dSRFYAkqEdyF_oRbgI8ypA" target="_s0SBwQkqEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_zoHtEQkqEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_zoHtEgkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.25.Fork and Join.uml#_zn98EAkqEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zoHtEwkqEdyF_oRbgI8ypA" points="[12, 2, -62, -9]$[72, 2, -2, -9]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zoHtFAkqEdyF_oRbgI8ypA" id="(0.8,0.46666667)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_1Ihv4QkqEdyF_oRbgI8ypA" type="4001" source="_kLdx0AkqEdyF_oRbgI8ypA" target="_k8C6MAkqEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_1Ihv4gkqEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_1Ihv4wkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.25.Fork and Join.uml#_1Ihv4AkqEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1Ihv5AkqEdyF_oRbgI8ypA" points="[8, 2, -106, 1]$[84, 2, -30, 1]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1Ihv5QkqEdyF_oRbgI8ypA" id="(0.8666667,0.5)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_2IJZ0QkqEdyF_oRbgI8ypA" type="4001" source="_nRMzsAkqEdyF_oRbgI8ypA" target="_oC0d4AkqEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_2IJZ0gkqEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_2IJZ0wkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.25.Fork and Join.uml#_2IJZ0AkqEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2IJZ1AkqEdyF_oRbgI8ypA" points="[30, 2, -86, 0]$[105, 3, -11, 1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_2ITK0AkqEdyF_oRbgI8ypA" id="(0.18333334,0.53333336)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_3VL0sQkqEdyF_oRbgI8ypA" type="4001" source="_oC0d4AkqEdyF_oRbgI8ypA" target="_tR7nEAkqEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_3VL0sgkqEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_3VL0swkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.25.Fork and Join.uml#_3VL0sAkqEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3VL0tAkqEdyF_oRbgI8ypA" points="[30, -14, -47, 19]$[76, -58, -1, -25]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_4pOPcQkqEdyF_oRbgI8ypA" type="4001" source="_k8C6MAkqEdyF_oRbgI8ypA" target="_tR7nEAkqEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_4pOPcgkqEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_4pOPcwkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.25.Fork and Join.uml#_4pOPcAkqEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4pOPdAkqEdyF_oRbgI8ypA" points="[7, 2, -48, -16]$[55, 18, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4pOPdQkqEdyF_oRbgI8ypA" id="(0.8833333,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4pOPdgkqEdyF_oRbgI8ypA" id="(0.0,0.42)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_6KOIIQkqEdyF_oRbgI8ypA" type="4001" source="_tR7nEAkqEdyF_oRbgI8ypA" target="_rfpKEAkqEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_6KOIIgkqEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_6KOIIwkqEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.25.Fork and Join.uml#_6KOIIAkqEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6KOIJAkqEdyF_oRbgI8ypA" points="[4, -3, -57, 0]$[48, 0, -13, 3]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6KX5IAkqEdyF_oRbgI8ypA" id="(0.0,0.68)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6KX5IQkqEdyF_oRbgI8ypA" id="(0.019607844,0.5)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_F0JYoQkrEdyF_oRbgI8ypA" type="4001" source="_s0SBwQkqEdyF_oRbgI8ypA" target="_kLdx0AkqEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_F0JYogkrEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_F0JYowkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.25.Fork and Join.uml#_F0JYoAkrEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_F0JYpAkrEdyF_oRbgI8ypA" points="[2, -1, -62, 20]$[54, -20, -10, 1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_F0JYpQkrEdyF_oRbgI8ypA" id="(0.16666667,0.56666666)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_GhJokAkrEdyF_oRbgI8ypA" type="4001" source="_s0SBwQkqEdyF_oRbgI8ypA" target="_nRMzsAkqEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_GhJokQkrEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_GhJokgkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.25.Fork and Join.uml#_Gg_3kAkrEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GhJokwkrEdyF_oRbgI8ypA" points="[2, 1, -65, -32]$[58, 33, -9, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gCYy8KJREdytfuupSpLWRw" id="(0.25,0.76)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GhJolAkrEdyF_oRbgI8ypA" id="(0.15,0.53333336)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.32.State with compartments.uml b/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.32.State with compartments.uml
deleted file mode 100644
index 719afe9..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.32.State with compartments.uml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:StateMachine xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_sXbnkKJSEdyjMdUT4ZzKyQ" name="StateMachine">
- <region xmi:id="_t0td4KJSEdyjMdUT4ZzKyQ">
- <subvertex xmi:type="uml:State" xmi:id="_uNmfAKJSEdyjMdUT4ZzKyQ" name="Typing Password">
- <entry xmi:type="uml:Activity" xmi:id="_HeOOsKJTEdyjMdUT4ZzKyQ" name="set echo invisible"/>
- <exit xmi:type="uml:Activity" xmi:id="_MNnWAKJTEdyjMdUT4ZzKyQ" name="set echo normal"/>
- </subvertex>
- <subvertex xmi:type="uml:State" xmi:id="_u1Y3wKJSEdyjMdUT4ZzKyQ" name="Typing Password">
- <entry xmi:type="uml:Activity" xmi:id="_JwjdsKJTEdyjMdUT4ZzKyQ" name="set echo invisible"/>
- <exit xmi:type="uml:Activity" xmi:id="_NeE4UKJTEdyjMdUT4ZzKyQ" name="set echo normal"/>
- <region xmi:id="_u1-toKJSEdyjMdUT4ZzKyQ" name="Region">
- <subvertex xmi:type="uml:State" xmi:id="_Tw3FAKJTEdyjMdUT4ZzKyQ" name="State"/>
- </region>
- </subvertex>
- </region>
-</uml:StateMachine>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.32.State with compartments.umlstatemachine_diagram b/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.32.State with compartments.umlstatemachine_diagram
deleted file mode 100644
index e2e6db4..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.32.State with compartments.umlstatemachine_diagram
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_sbm88KJSEdyjMdUT4ZzKyQ" type="UMLStateMachine" name="15.32.State with compartments.umlstatemachine_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_stVmIKJSEdyjMdUT4ZzKyQ" type="2004">
- <children xmi:type="notation:Node" xmi:id="_stVmI6JSEdyjMdUT4ZzKyQ" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_t03O4KJSEdyjMdUT4ZzKyQ" type="3013">
- <children xmi:type="notation:Node" xmi:id="_t03O46JSEdyjMdUT4ZzKyQ" type="7004">
- <children xmi:type="notation:Node" xmi:id="_uTtHAKJSEdyjMdUT4ZzKyQ" type="3001">
- <children xmi:type="notation:Node" xmi:id="_uTtHA6JSEdyjMdUT4ZzKyQ" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_uT24AKJSEdyjMdUT4ZzKyQ" type="7005">
- <styles xmi:type="notation:SortingStyle" xmi:id="_uT24AaJSEdyjMdUT4ZzKyQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_uT24AqJSEdyjMdUT4ZzKyQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_uTtHAaJSEdyjMdUT4ZzKyQ"/>
- <element xmi:type="uml:State" href="15.32.State with compartments.uml#_uNmfAKJSEdyjMdUT4ZzKyQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uTtHAqJSEdyjMdUT4ZzKyQ" x="31" y="45" width="169" height="69"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_u2bZkKJSEdyjMdUT4ZzKyQ" type="3012">
- <children xmi:type="notation:Node" xmi:id="_u2bZk6JSEdyjMdUT4ZzKyQ" type="5004"/>
- <children xmi:type="notation:Node" xmi:id="_u2lKkKJSEdyjMdUT4ZzKyQ" type="7006">
- <styles xmi:type="notation:SortingStyle" xmi:id="_u2lKkaJSEdyjMdUT4ZzKyQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_u2lKkqJSEdyjMdUT4ZzKyQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Qa4AoKJTEdyjMdUT4ZzKyQ" type="3002">
- <children xmi:type="notation:Node" xmi:id="_QbBxoKJTEdyjMdUT4ZzKyQ" type="7003">
- <children xmi:type="notation:Node" xmi:id="_TxJ_8KJTEdyjMdUT4ZzKyQ" type="3001">
- <children xmi:type="notation:Node" xmi:id="_TxJ_86JTEdyjMdUT4ZzKyQ" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_TxJ_9KJTEdyjMdUT4ZzKyQ" type="7005">
- <styles xmi:type="notation:SortingStyle" xmi:id="_TxJ_9aJTEdyjMdUT4ZzKyQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_TxJ_9qJTEdyjMdUT4ZzKyQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_TxJ_8aJTEdyjMdUT4ZzKyQ"/>
- <element xmi:type="uml:State" href="15.32.State with compartments.uml#_Tw3FAKJTEdyjMdUT4ZzKyQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TxJ_8qJTEdyjMdUT4ZzKyQ" x="50" y="11"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_QbBxoaJTEdyjMdUT4ZzKyQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_QbBxoqJTEdyjMdUT4ZzKyQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Qa4AoaJTEdyjMdUT4ZzKyQ"/>
- <element xmi:type="uml:Region" href="15.32.State with compartments.uml#_u1-toKJSEdyjMdUT4ZzKyQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qa4AoqJTEdyjMdUT4ZzKyQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_u2bZkaJSEdyjMdUT4ZzKyQ"/>
- <element xmi:type="uml:State" href="15.32.State with compartments.uml#_u1Y3wKJSEdyjMdUT4ZzKyQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u2bZkqJSEdyjMdUT4ZzKyQ" x="223" y="33" width="193" height="133"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_t03O5KJSEdyjMdUT4ZzKyQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_t03O5aJSEdyjMdUT4ZzKyQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_t03O4aJSEdyjMdUT4ZzKyQ"/>
- <element xmi:type="uml:Region" href="15.32.State with compartments.uml#_t0td4KJSEdyjMdUT4ZzKyQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_t03O4qJSEdyjMdUT4ZzKyQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_stVmIaJSEdyjMdUT4ZzKyQ"/>
- <element xmi:type="uml:StateMachine" href="15.32.State with compartments.uml#_sXbnkKJSEdyjMdUT4ZzKyQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_stVmIqJSEdyjMdUT4ZzKyQ"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_sbm88aJSEdyjMdUT4ZzKyQ"/>
- <element xmi:type="uml:StateMachine" href="15.32.State with compartments.uml#_sXbnkKJSEdyjMdUT4ZzKyQ"/>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.35.Orthogonal state with regions.uml b/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.35.Orthogonal state with regions.uml
deleted file mode 100644
index 058dec2..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.35.Orthogonal state with regions.uml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:StateMachine xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_gAxdkAkrEdyF_oRbgI8ypA" name="CourseAttempt">
- <region xmi:id="_iFiKoAkrEdyF_oRbgI8ypA">
- <subvertex xmi:type="uml:State" xmi:id="_kfdPYAkrEdyF_oRbgI8ypA" name="Studying">
- <region xmi:id="_kfnAYAkrEdyF_oRbgI8ypA" name="Region">
- <subvertex xmi:type="uml:Pseudostate" xmi:id="_uZVekAkrEdyF_oRbgI8ypA"/>
- <subvertex xmi:type="uml:FinalState" xmi:id="_wd9BsAkrEdyF_oRbgI8ypA"/>
- <subvertex xmi:type="uml:State" xmi:id="_zvKTwAkrEdyF_oRbgI8ypA" name="Lab1"/>
- <subvertex xmi:type="uml:State" xmi:id="_08C9oAkrEdyF_oRbgI8ypA" name="Lab2"/>
- <transition xmi:id="_3ZGO4AkrEdyF_oRbgI8ypA" target="_zvKTwAkrEdyF_oRbgI8ypA" source="_uZVekAkrEdyF_oRbgI8ypA"/>
- <transition xmi:id="_Yy5UMBZpEdyhrYeRBHu7AQ" target="_08C9oAkrEdyF_oRbgI8ypA" source="_zvKTwAkrEdyF_oRbgI8ypA">
- <trigger xmi:id="_dUkvoBZpEdyhrYeRBHu7AQ" name="trigger">
- <event xmi:type="uml:SignalEvent" href="events.uml#_M0ZXUBZoEdyHc83xjr4kXQ"/>
- </trigger>
- </transition>
- <transition xmi:id="_n6uO8BZpEdyhrYeRBHu7AQ" target="_wd9BsAkrEdyF_oRbgI8ypA" source="_08C9oAkrEdyF_oRbgI8ypA">
- <trigger xmi:id="_tLe98BZpEdyhrYeRBHu7AQ" name="trigger">
- <event xmi:type="uml:SignalEvent" href="events.uml#_M0ZXUBZoEdyHc83xjr4kXQ"/>
- </trigger>
- </transition>
- </region>
- <region xmi:id="_lUW3EAkrEdyF_oRbgI8ypA">
- <subvertex xmi:type="uml:Pseudostate" xmi:id="_u88h8AkrEdyF_oRbgI8ypA"/>
- <subvertex xmi:type="uml:FinalState" xmi:id="_xEPloAkrEdyF_oRbgI8ypA"/>
- <subvertex xmi:type="uml:State" xmi:id="_-SBOgAkrEdyF_oRbgI8ypA" name="Term Project"/>
- <transition xmi:id="_BD7VcAksEdyF_oRbgI8ypA" target="_-SBOgAkrEdyF_oRbgI8ypA" source="_u88h8AkrEdyF_oRbgI8ypA"/>
- <transition xmi:id="_1w4GcBZpEdyhrYeRBHu7AQ" target="_xEPloAkrEdyF_oRbgI8ypA" source="_-SBOgAkrEdyF_oRbgI8ypA">
- <trigger xmi:id="_DqKxgBZqEdyhrYeRBHu7AQ" name="trigger">
- <event xmi:type="uml:SignalEvent" href="events.uml#_RBoz0BZoEdyHc83xjr4kXQ"/>
- </trigger>
- </transition>
- </region>
- <region xmi:id="_loeF4AkrEdyF_oRbgI8ypA">
- <subvertex xmi:type="uml:Pseudostate" xmi:id="_vZjlcAkrEdyF_oRbgI8ypA"/>
- <subvertex xmi:type="uml:FinalState" xmi:id="_xdRwsAkrEdyF_oRbgI8ypA"/>
- <subvertex xmi:type="uml:State" xmi:id="_G3QmAAksEdyF_oRbgI8ypA" name="Final Test"/>
- <transition xmi:id="_Ire8sAksEdyF_oRbgI8ypA" target="_G3QmAAksEdyF_oRbgI8ypA" source="_vZjlcAkrEdyF_oRbgI8ypA"/>
- <transition xmi:id="_4duuQBZpEdyhrYeRBHu7AQ" target="_xdRwsAkrEdyF_oRbgI8ypA" source="_G3QmAAksEdyF_oRbgI8ypA">
- <trigger xmi:id="_L3IL4BZqEdyhrYeRBHu7AQ" name="trigger">
- <event xmi:type="uml:SignalEvent" href="events.uml#_Uk3qABZoEdyHc83xjr4kXQ"/>
- </trigger>
- </transition>
- <transition xmi:id="_6FvN4BZpEdyhrYeRBHu7AQ" target="_oj7KYAkrEdyF_oRbgI8ypA" source="_G3QmAAksEdyF_oRbgI8ypA">
- <trigger xmi:id="_Pbj78BZqEdyhrYeRBHu7AQ" name="trigger">
- <event xmi:type="uml:SendSignalEvent" href="events.uml#_aSXYUBZoEdyHc83xjr4kXQ"/>
- </trigger>
- </transition>
- </region>
- </subvertex>
- <subvertex xmi:type="uml:State" xmi:id="_oj7KYAkrEdyF_oRbgI8ypA" name="Failed"/>
- <subvertex xmi:type="uml:State" xmi:id="_pMAeEAkrEdyF_oRbgI8ypA" name="Passed"/>
- <subvertex xmi:type="uml:Pseudostate" xmi:id="_swIsIAkrEdyF_oRbgI8ypA"/>
- <transition xmi:id="_FWjBMAksEdyF_oRbgI8ypA" target="_kfdPYAkrEdyF_oRbgI8ypA" source="_swIsIAkrEdyF_oRbgI8ypA"/>
- <transition xmi:id="_LdP5sAksEdyF_oRbgI8ypA" target="_pMAeEAkrEdyF_oRbgI8ypA" source="_kfdPYAkrEdyF_oRbgI8ypA"/>
- </region>
-</uml:StateMachine>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.35.Orthogonal state with regions.umlstatemachine_diagram b/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.35.Orthogonal state with regions.umlstatemachine_diagram
deleted file mode 100644
index 45a0bae..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.35.Orthogonal state with regions.umlstatemachine_diagram
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_gAxdkQkrEdyF_oRbgI8ypA" type="UMLStateMachine" name="15.35.Orthogonal state with regions.umlstatemachine_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_gCG6UAkrEdyF_oRbgI8ypA" type="2004">
- <children xmi:type="notation:Node" xmi:id="_gCQrUAkrEdyF_oRbgI8ypA" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_iFiKoQkrEdyF_oRbgI8ypA" type="3013">
- <children xmi:type="notation:Node" xmi:id="_iFiKpAkrEdyF_oRbgI8ypA" type="7004">
- <children xmi:type="notation:Node" xmi:id="_kgDsUAkrEdyF_oRbgI8ypA" type="3012">
- <children xmi:type="notation:Node" xmi:id="_kgDsUwkrEdyF_oRbgI8ypA" type="5004"/>
- <children xmi:type="notation:Node" xmi:id="_kgDsVAkrEdyF_oRbgI8ypA" type="3002">
- <children xmi:type="notation:Node" xmi:id="_kgDsVwkrEdyF_oRbgI8ypA" type="7003">
- <children xmi:type="notation:Node" xmi:id="_uZfPkAkrEdyF_oRbgI8ypA" type="3004">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_uZfPkQkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Pseudostate" href="15.35.Orthogonal state with regions.uml#_uZVekAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_uZfPkgkrEdyF_oRbgI8ypA" x="20" y="29"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_wd9BsQkrEdyF_oRbgI8ypA" type="3003">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_wd9BsgkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:FinalState" href="15.35.Orthogonal state with regions.uml#_wd9BsAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wd9BswkrEdyF_oRbgI8ypA" x="509" y="22"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zvm_sAkrEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_zvm_swkrEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zvm_sQkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.35.Orthogonal state with regions.uml#_zvKTwAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zvm_sgkrEdyF_oRbgI8ypA" x="101" y="22"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_08C9oQkrEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_08C9pAkrEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_08C9ogkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.35.Orthogonal state with regions.uml#_08C9oAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_08C9owkrEdyF_oRbgI8ypA" x="341" y="22"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_kgDsWAkrEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_kgDsWQkrEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_kgDsVQkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Region" href="15.35.Orthogonal state with regions.uml#_kfnAYAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kgDsVgkrEdyF_oRbgI8ypA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_lUW3EQkrEdyF_oRbgI8ypA" type="3002">
- <children xmi:type="notation:Node" xmi:id="_lUW3FAkrEdyF_oRbgI8ypA" type="7003">
- <children xmi:type="notation:Node" xmi:id="_u9GS8AkrEdyF_oRbgI8ypA" type="3004">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_u9GS8QkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Pseudostate" href="15.35.Orthogonal state with regions.uml#_u88h8AkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_u9GS8gkrEdyF_oRbgI8ypA" x="17" y="24"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_xEPloQkrEdyF_oRbgI8ypA" type="3003">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_xEPlogkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:FinalState" href="15.35.Orthogonal state with regions.uml#_xEPloAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xEPlowkrEdyF_oRbgI8ypA" x="521" y="19"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_-SUJcAkrEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_-SUJcwkrEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_-SUJcQkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.35.Orthogonal state with regions.uml#_-SBOgAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-SUJcgkrEdyF_oRbgI8ypA" x="101" y="16" width="85"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_lUW3FQkrEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_lUW3FgkrEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_lUW3EgkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Region" href="15.35.Orthogonal state with regions.uml#_lUW3EAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lUW3EwkrEdyF_oRbgI8ypA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_loeF4QkrEdyF_oRbgI8ypA" type="3002">
- <children xmi:type="notation:Node" xmi:id="_loeF5AkrEdyF_oRbgI8ypA" type="7003">
- <children xmi:type="notation:Node" xmi:id="_vZjlcQkrEdyF_oRbgI8ypA" type="3004">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_vZjlcgkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Pseudostate" href="15.35.Orthogonal state with regions.uml#_vZjlcAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vZjlcwkrEdyF_oRbgI8ypA" x="22" y="30"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_xdbhsAkrEdyF_oRbgI8ypA" type="3003">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_xdbhsQkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:FinalState" href="15.35.Orthogonal state with regions.uml#_xdRwsAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xdbhsgkrEdyF_oRbgI8ypA" x="521" y="27"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_G3Zv8AksEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_G3Zv8wksEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_G3Zv8QksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.35.Orthogonal state with regions.uml#_G3QmAAksEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_G3Zv8gksEdyF_oRbgI8ypA" x="80" y="24"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_loeF5QkrEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_loeF5gkrEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_loeF4gkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Region" href="15.35.Orthogonal state with regions.uml#_loeF4AkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_loeF4wkrEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_kgDsUQkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.35.Orthogonal state with regions.uml#_kfdPYAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kgDsUgkrEdyF_oRbgI8ypA" x="67" y="9" width="577" height="265"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_okOFUAkrEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_okOFUwkrEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_okOFUQkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.35.Orthogonal state with regions.uml#_oj7KYAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_okOFUgkrEdyF_oRbgI8ypA" x="283" y="309"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_pMKPEAkrEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_pMKPEwkrEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_pMKPEQkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.35.Orthogonal state with regions.uml#_pMAeEAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pMKPEgkrEdyF_oRbgI8ypA" x="535" y="309"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_swIsIQkrEdyF_oRbgI8ypA" type="3004">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_swIsIgkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Pseudostate" href="15.35.Orthogonal state with regions.uml#_swIsIAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_swIsIwkrEdyF_oRbgI8ypA" x="19" y="57"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_iFiKpQkrEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_iFiKpgkrEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_iFiKogkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Region" href="15.35.Orthogonal state with regions.uml#_iFiKoAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iFiKowkrEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_gCG6UQkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:StateMachine" href="15.35.Orthogonal state with regions.uml#_gAxdkAkrEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gCG6UgkrEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_gAxdkgkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:StateMachine" href="15.35.Orthogonal state with regions.uml#_gAxdkAkrEdyF_oRbgI8ypA"/>
- <edges xmi:type="notation:Edge" xmi:id="_3ZGO4QkrEdyF_oRbgI8ypA" type="4001" source="_uZfPkAkrEdyF_oRbgI8ypA" target="_zvm_sAkrEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_3ZGO4gkrEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_3ZGO4wkrEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.35.Orthogonal state with regions.uml#_3ZGO4AkrEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3ZGO5AkrEdyF_oRbgI8ypA" points="[8, -1, -75, 0]$[74, -2, -9, -1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3ZP_4AkrEdyF_oRbgI8ypA" id="(0.15,0.43333334)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_BD7VcQksEdyF_oRbgI8ypA" type="4001" source="_u9GS8AkrEdyF_oRbgI8ypA" target="_-SUJcAkrEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_BD7VcgksEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_BD7VcwksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.35.Orthogonal state with regions.uml#_BD7VcAksEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_BD7VdAksEdyF_oRbgI8ypA" points="[8, -2, -103, 3]$[69, -2, -42, 3]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_FWjBMQksEdyF_oRbgI8ypA" type="4001" source="_swIsIQkrEdyF_oRbgI8ypA" target="_kgDsUAkrEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_FWjBMgksEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_FWjBMwksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.35.Orthogonal state with regions.uml#_FWjBMAksEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FWjBNAksEdyF_oRbgI8ypA" points="[1, 8, 0, -47]$[-3, 53, -4, -2]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FWjBNQksEdyF_oRbgI8ypA" id="(0.0,0.20754717)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Ire8sQksEdyF_oRbgI8ypA" type="4001" source="_vZjlcQkrEdyF_oRbgI8ypA" target="_G3Zv8AksEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ire8sgksEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Ire8swksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.35.Orthogonal state with regions.uml#_Ire8sAksEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ire8tAksEdyF_oRbgI8ypA" points="[8, 1, -54, 0]$[51, 0, -11, -1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ire8tQksEdyF_oRbgI8ypA" id="(0.18333334,0.46666667)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_LdP5sQksEdyF_oRbgI8ypA" type="4001" source="_kgDsUAkrEdyF_oRbgI8ypA" target="_pMKPEAkrEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_LdP5sgksEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_LdP5swksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.35.Orthogonal state with regions.uml#_LdP5sAksEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LdP5tAksEdyF_oRbgI8ypA" points="[-4, 4, -5, -86]$[-29, 87, -30, -3]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LdP5tQksEdyF_oRbgI8ypA" id="(0.86135185,0.98490566)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_YzDFMBZpEdyhrYeRBHu7AQ" type="4001" source="_zvm_sAkrEdyF_oRbgI8ypA" target="_08C9oQkrEdyF_oRbgI8ypA">
- <children xmi:type="notation:Node" xmi:id="_YzDFNBZpEdyhrYeRBHu7AQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_YzDFNRZpEdyhrYeRBHu7AQ" x="-4" y="-13"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_YzDFMRZpEdyhrYeRBHu7AQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_YzDFMhZpEdyhrYeRBHu7AQ"/>
- <element xmi:type="uml:Transition" href="15.35.Orthogonal state with regions.uml#_Yy5UMBZpEdyhrYeRBHu7AQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YzDFMxZpEdyhrYeRBHu7AQ" points="[9, 1, -190, 0]$[189, 1, -10, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YzM2MBZpEdyhrYeRBHu7AQ" id="(0.85,0.43333334)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YzWAIBZpEdyhrYeRBHu7AQ" id="(0.16666667,0.46666667)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_n6uO8RZpEdyhrYeRBHu7AQ" type="4001" source="_08C9oQkrEdyF_oRbgI8ypA" target="_wd9BsQkrEdyF_oRbgI8ypA">
- <children xmi:type="notation:Node" xmi:id="_n6uO9RZpEdyhrYeRBHu7AQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_n6uO9hZpEdyhrYeRBHu7AQ" x="-4" y="-12"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_n6uO8hZpEdyhrYeRBHu7AQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_n6uO8xZpEdyhrYeRBHu7AQ"/>
- <element xmi:type="uml:Transition" href="15.35.Orthogonal state with regions.uml#_n6uO8BZpEdyhrYeRBHu7AQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_n6uO9BZpEdyhrYeRBHu7AQ" points="[1, -1, -113, 0]$[109, 1, -5, 2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n63Y4BZpEdyhrYeRBHu7AQ" id="(0.98333335,0.46666667)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_n63Y4RZpEdyhrYeRBHu7AQ" id="(0.2173913,0.5652174)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_1w4GcRZpEdyhrYeRBHu7AQ" type="4001" source="_-SUJcAkrEdyF_oRbgI8ypA" target="_xEPloQkrEdyF_oRbgI8ypA">
- <children xmi:type="notation:Node" xmi:id="_1w4GdRZpEdyhrYeRBHu7AQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_1w4GdhZpEdyhrYeRBHu7AQ" x="-11" y="-15"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_1w4GchZpEdyhrYeRBHu7AQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_1w4GcxZpEdyhrYeRBHu7AQ"/>
- <element xmi:type="uml:Transition" href="15.35.Orthogonal state with regions.uml#_1w4GcBZpEdyhrYeRBHu7AQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1w4GdBZpEdyhrYeRBHu7AQ" points="[2, 3, -337, 0]$[337, 3, -2, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1xB3cBZpEdyhrYeRBHu7AQ" id="(0.9764706,0.46666667)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1xB3cRZpEdyhrYeRBHu7AQ" id="(0.08695652,0.4347826)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_4duuQRZpEdyhrYeRBHu7AQ" type="4001" source="_G3Zv8AksEdyF_oRbgI8ypA" target="_xdbhsAkrEdyF_oRbgI8ypA">
- <children xmi:type="notation:Node" xmi:id="_4duuRRZpEdyhrYeRBHu7AQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4duuRhZpEdyhrYeRBHu7AQ" y="-17"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_4duuQhZpEdyhrYeRBHu7AQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_4duuQxZpEdyhrYeRBHu7AQ"/>
- <element xmi:type="uml:Transition" href="15.35.Orthogonal state with regions.uml#_4duuQBZpEdyhrYeRBHu7AQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4duuRBZpEdyhrYeRBHu7AQ" points="[7, 1, -386, 0]$[388, 3, -5, 2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4d4fQBZpEdyhrYeRBHu7AQ" id="(0.8833333,0.46666667)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4d4fQRZpEdyhrYeRBHu7AQ" id="(0.2173913,0.5652174)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_6FvN4RZpEdyhrYeRBHu7AQ" type="4001" source="_G3Zv8AksEdyF_oRbgI8ypA" target="_okOFUAkrEdyF_oRbgI8ypA">
- <children xmi:type="notation:Node" xmi:id="_6F4-4RZpEdyhrYeRBHu7AQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_6F4-4hZpEdyhrYeRBHu7AQ" x="31" y="-15"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_6FvN4hZpEdyhrYeRBHu7AQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_6FvN4xZpEdyhrYeRBHu7AQ"/>
- <element xmi:type="uml:Transition" href="15.35.Orthogonal state with regions.uml#_6FvN4BZpEdyhrYeRBHu7AQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6F4-4BZpEdyhrYeRBHu7AQ" points="[0, 20, -99, -75]$[0, 89, -99, -6]$[97, 89, -2, -6]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6F4-4xZpEdyhrYeRBHu7AQ" id="(0.05,0.56666666)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.38.State machine with exit point on the border of the statemachine.uml b/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.38.State machine with exit point on the border of the statemachine.uml
deleted file mode 100644
index b6b9a97..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.38.State machine with exit point on the border of the statemachine.uml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:StateMachine xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_fnNRkAksEdyF_oRbgI8ypA" name="ReadAmountSM">
- <region xmi:id="_hxySwAksEdyF_oRbgI8ypA">
- <subvertex xmi:type="uml:State" xmi:id="_jY5agAksEdyF_oRbgI8ypA" name="selectAmount"/>
- <subvertex xmi:type="uml:State" xmi:id="_mHiLAAksEdyF_oRbgI8ypA" name="enterAmount"/>
- <subvertex xmi:type="uml:FinalState" xmi:id="_pXjKQAksEdyF_oRbgI8ypA"/>
- <subvertex xmi:type="uml:Pseudostate" xmi:id="_qeLbIAksEdyF_oRbgI8ypA"/>
- <transition xmi:id="_rX2OEAksEdyF_oRbgI8ypA" target="_jY5agAksEdyF_oRbgI8ypA" source="_qeLbIAksEdyF_oRbgI8ypA"/>
- <transition xmi:id="_wJo0UBZtEdyhrYeRBHu7AQ" target="_pXjKQAksEdyF_oRbgI8ypA" source="_jY5agAksEdyF_oRbgI8ypA">
- <trigger xmi:id="_u_nmUBZvEdyhrYeRBHu7AQ" name="trigger">
- <event xmi:type="uml:SignalEvent" href="events.uml#_E8Sj4BZuEdyhrYeRBHu7AQ"/>
- </trigger>
- </transition>
- <transition xmi:id="_xlu-4BZtEdyhrYeRBHu7AQ" target="_pXjKQAksEdyF_oRbgI8ypA" source="_mHiLAAksEdyF_oRbgI8ypA">
- <trigger xmi:id="_f4c9cBZwEdyVs8cun7EoUA" name="trigger">
- <event xmi:type="uml:SignalEvent" href="events.uml#_MV4noBZuEdyhrYeRBHu7AQ"/>
- </trigger>
- </transition>
- <transition xmi:id="_ziK2YBZtEdyhrYeRBHu7AQ" target="_mHiLAAksEdyF_oRbgI8ypA" source="_jY5agAksEdyF_oRbgI8ypA">
- <trigger xmi:id="_2BEP0BZvEdyhrYeRBHu7AQ" name="trigger">
- <event xmi:type="uml:SignalEvent" href="events.uml#_JCkcwBZuEdyhrYeRBHu7AQ"/>
- </trigger>
- </transition>
- <transition xmi:id="_1mznoBZtEdyhrYeRBHu7AQ" target="_vuyZIAksEdyF_oRbgI8ypA" source="_jY5agAksEdyF_oRbgI8ypA">
- <trigger xmi:id="_lpRskBZwEdyVs8cun7EoUA" name="trigger">
- <event xmi:type="uml:CallEvent" href="events.uml#_zFUF0BZuEdyhrYeRBHu7AQ"/>
- </trigger>
- </transition>
- <transition xmi:id="_3jZQIBZtEdyhrYeRBHu7AQ" target="_vuyZIAksEdyF_oRbgI8ypA" source="_mHiLAAksEdyF_oRbgI8ypA">
- <trigger xmi:id="_nikwgBZwEdyVs8cun7EoUA" name="trigger">
- <event xmi:type="uml:CallEvent" href="events.uml#_zFUF0BZuEdyhrYeRBHu7AQ"/>
- </trigger>
- </transition>
- </region>
- <connectionPoint xmi:id="_vuyZIAksEdyF_oRbgI8ypA" name="aborted" kind="exitPoint"/>
-</uml:StateMachine>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.38.State machine with exit point on the border of the statemachine.umlstatemachine_diagram b/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.38.State machine with exit point on the border of the statemachine.umlstatemachine_diagram
deleted file mode 100644
index 8843daa..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/examples/15.38.State machine with exit point on the border of the statemachine.umlstatemachine_diagram
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_fnNRkQksEdyF_oRbgI8ypA" type="UMLStateMachine" name="15.38.State machine with exit point on the border of the statemachine.umlstatemachine_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_fpABUAksEdyF_oRbgI8ypA" type="2004">
- <children xmi:type="notation:Node" xmi:id="_fpABUwksEdyF_oRbgI8ypA" type="5005"/>
- <children xmi:type="notation:Node" xmi:id="_hxySwQksEdyF_oRbgI8ypA" type="3013">
- <children xmi:type="notation:Node" xmi:id="_hxySxAksEdyF_oRbgI8ypA" type="7004">
- <children xmi:type="notation:Node" xmi:id="_jZM8gAksEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_jZM8gwksEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_jZM8gQksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.38.State machine with exit point on the border of the statemachine.uml#_jY5agAksEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jZM8ggksEdyF_oRbgI8ypA" x="102" y="115" width="100"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_mH1tAAksEdyF_oRbgI8ypA" type="3001">
- <children xmi:type="notation:Node" xmi:id="_mH1tAwksEdyF_oRbgI8ypA" type="5001"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_mH1tAQksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:State" href="15.38.State machine with exit point on the border of the statemachine.uml#_mHiLAAksEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mH1tAgksEdyF_oRbgI8ypA" x="273" y="253" width="95"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_pXjKQQksEdyF_oRbgI8ypA" type="3003">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_pXjKQgksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:FinalState" href="15.38.State machine with exit point on the border of the statemachine.uml#_pXjKQAksEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pXjKQwksEdyF_oRbgI8ypA" x="129" y="256"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_qeLbIQksEdyF_oRbgI8ypA" type="3004">
- <styles xmi:type="notation:ShapeStyle" xmi:id="_qeLbIgksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Pseudostate" href="15.38.State machine with exit point on the border of the statemachine.uml#_qeLbIAksEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qeLbIwksEdyF_oRbgI8ypA" x="135" y="50"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_hxySxQksEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_hxySxgksEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_hxySwgksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Region" href="15.38.State machine with exit point on the border of the statemachine.uml#_hxySwAksEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hxySwwksEdyF_oRbgI8ypA"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_vvF7IAksEdyF_oRbgI8ypA" type="3015">
- <children xmi:type="notation:Node" xmi:id="_vvY2EAksEdyF_oRbgI8ypA" type="5007">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_vvY2EQksEdyF_oRbgI8ypA" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_vvF7IQksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Pseudostate" href="15.38.State machine with exit point on the border of the statemachine.uml#_vuyZIAksEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vvF7IgksEdyF_oRbgI8ypA" x="720" y="285"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_fpABUQksEdyF_oRbgI8ypA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fpABUgksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:StateMachine" href="15.38.State machine with exit point on the border of the statemachine.uml#_fnNRkAksEdyF_oRbgI8ypA"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_fnNRkgksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:StateMachine" href="15.38.State machine with exit point on the border of the statemachine.uml#_fnNRkAksEdyF_oRbgI8ypA"/>
- <edges xmi:type="notation:Edge" xmi:id="_rX2OEQksEdyF_oRbgI8ypA" type="4001" source="_qeLbIQksEdyF_oRbgI8ypA" target="_jZM8gAksEdyF_oRbgI8ypA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_rX2OEgksEdyF_oRbgI8ypA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_rX2OEwksEdyF_oRbgI8ypA"/>
- <element xmi:type="uml:Transition" href="15.38.State machine with exit point on the border of the statemachine.uml#_rX2OEAksEdyF_oRbgI8ypA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rX2OFAksEdyF_oRbgI8ypA" points="[2, 8, -8, -65]$[-40, 69, -50, -4]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_wJo0URZtEdyhrYeRBHu7AQ" type="4001" source="_jZM8gAksEdyF_oRbgI8ypA" target="_pXjKQQksEdyF_oRbgI8ypA">
- <children xmi:type="notation:Node" xmi:id="_wJo0VRZtEdyhrYeRBHu7AQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_wJo0VhZtEdyhrYeRBHu7AQ" x="-36" y="26"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_wJo0UhZtEdyhrYeRBHu7AQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_wJo0UxZtEdyhrYeRBHu7AQ"/>
- <element xmi:type="uml:Transition" href="15.38.State machine with exit point on the border of the statemachine.uml#_wJo0UBZtEdyhrYeRBHu7AQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wJo0VBZtEdyhrYeRBHu7AQ" points="[6, 1, 0, -114]$[6, 104, 0, -11]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wJo0VxZtEdyhrYeRBHu7AQ" id="(0.32,0.96666664)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_xlu-4RZtEdyhrYeRBHu7AQ" type="4001" source="_mH1tAAksEdyF_oRbgI8ypA" target="_pXjKQQksEdyF_oRbgI8ypA">
- <children xmi:type="notation:Node" xmi:id="_xlu-5RZtEdyhrYeRBHu7AQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_xlu-5hZtEdyhrYeRBHu7AQ" x="-7" y="19"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_xlu-4hZtEdyhrYeRBHu7AQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_xlu-4xZtEdyhrYeRBHu7AQ"/>
- <element xmi:type="uml:Transition" href="15.38.State machine with exit point on the border of the statemachine.uml#_xlu-4BZtEdyhrYeRBHu7AQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xlu-5BZtEdyhrYeRBHu7AQ" points="[-7, -2, 133, 2]$[-128, -2, 12, 2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xl4v4BZtEdyhrYeRBHu7AQ" id="(0.07368421,0.5)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_ziK2YRZtEdyhrYeRBHu7AQ" type="4001" source="_jZM8gAksEdyF_oRbgI8ypA" target="_mH1tAAksEdyF_oRbgI8ypA">
- <children xmi:type="notation:Node" xmi:id="_ziK2ZRZtEdyhrYeRBHu7AQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ziK2ZhZtEdyhrYeRBHu7AQ" x="5" y="37"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_ziK2YhZtEdyhrYeRBHu7AQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_ziK2YxZtEdyhrYeRBHu7AQ"/>
- <element xmi:type="uml:Transition" href="15.38.State machine with exit point on the border of the statemachine.uml#_ziK2YBZtEdyhrYeRBHu7AQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ziK2ZBZtEdyhrYeRBHu7AQ" points="[15, 0, -97, -117]$[112, 0, 0, -117]$[112, 113, 0, -4]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ziK2ZxZtEdyhrYeRBHu7AQ" id="(0.85,0.6666667)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ziK2aBZtEdyhrYeRBHu7AQ" id="(0.2736842,0.13333334)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_1mznoRZtEdyhrYeRBHu7AQ" type="4001" source="_jZM8gAksEdyF_oRbgI8ypA" target="_vvF7IAksEdyF_oRbgI8ypA">
- <children xmi:type="notation:Node" xmi:id="_1mznpRZtEdyhrYeRBHu7AQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_1mznphZtEdyhrYeRBHu7AQ" x="-180" y="1"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_1mznohZtEdyhrYeRBHu7AQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_1mznoxZtEdyhrYeRBHu7AQ"/>
- <element xmi:type="uml:Transition" href="15.38.State machine with exit point on the border of the statemachine.uml#_1mznoBZtEdyhrYeRBHu7AQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1mznpBZtEdyhrYeRBHu7AQ" points="[9, 0, -536, -142]$[132, 0, -413, -142]$[538, 140, -7, -2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1mznpxZtEdyhrYeRBHu7AQ" id="(0.91,0.3)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_3jiaEBZtEdyhrYeRBHu7AQ" type="4001" source="_mH1tAAksEdyF_oRbgI8ypA" target="_vvF7IAksEdyF_oRbgI8ypA">
- <children xmi:type="notation:Node" xmi:id="_3jiaFBZtEdyhrYeRBHu7AQ" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_3jiaFRZtEdyhrYeRBHu7AQ" x="-46" y="-8"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_3jiaERZtEdyhrYeRBHu7AQ"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_3jiaEhZtEdyhrYeRBHu7AQ"/>
- <element xmi:type="uml:Transition" href="15.38.State machine with exit point on the border of the statemachine.uml#_3jZQIBZtEdyhrYeRBHu7AQ"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_3jiaExZtEdyhrYeRBHu7AQ" points="[6, 6, -366, 0]$[369, 8, -3, 2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3jiaFhZtEdyhrYeRBHu7AQ" id="(0.9368421,0.46666667)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_3jiaFxZtEdyhrYeRBHu7AQ" id="(0.2,0.6)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/plugin.properties b/tests/org.eclipse.uml2.diagram.statemachine.tests/plugin.properties
deleted file mode 100644
index 79f5cc2..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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=UML2 StateMachine Diagram Tests Plug-in (Incubation)
-providerName=Eclipse.org
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/plugin.xml b/tests/org.eclipse.uml2.diagram.statemachine.tests/plugin.xml
deleted file mode 100644
index 8de843c..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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:
- Sergey Gribovsky (Borland) - initial API and implementation
--->
-
-<plugin>
-</plugin>
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/AllNonUITests.java b/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/AllNonUITests.java
deleted file mode 100644
index 6746e9b..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/AllNonUITests.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2007 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:
- * Sergey Gribovsky (Borland) - initial API and implementation
- */
-
-package org.eclipse.uml2.diagram.statemachine.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.uml2.diagram.common.tests.FakeNonUITest;
-
-
-public class AllNonUITests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.uml2.diagram.statemachine"); //$NON-NLS-1$
- //$JUnit-BEGIN$
- suite.addTestSuite(FakeNonUITest.class);
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/AllTests.java b/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/AllTests.java
deleted file mode 100644
index 1b4fdf5..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/AllTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2007 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:
- * Sergey Gribovsky (Borland) - initial API and implementation
- */
-
-package org.eclipse.uml2.diagram.statemachine.tests;
-
-import org.eclipse.uml2.diagram.statemachine.tests.sync.SynchronizedDiagramContentTest;
-import org.eclipse.uml2.diagram.statemachine.tests.tools.CreationToolTest;
-import org.eclipse.uml2.diagram.statemachine.tests.whole.TestWholeDiagramSuite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.uml2.diagram.statemachine"); //$NON-NLS-1$
- //$JUnit-BEGIN$
- suite.addTestSuite(CreationToolTest.class);
- suite.addTestSuite(SynchronizedDiagramContentTest.class);
- suite.addTest(new TestWholeDiagramSuite());
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/StateMachineDiagramTestCase.java b/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/StateMachineDiagramTestCase.java
deleted file mode 100644
index 710b05e..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/StateMachineDiagramTestCase.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2007 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:
- * Sergey Gribovsky (Borland) - initial API and implementation
- */
-
-package org.eclipse.uml2.diagram.statemachine.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-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.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.uml2.diagram.statemachine.part.UMLDiagramEditorUtil;
-
-
-public class StateMachineDiagramTestCase extends TestCase {
- public StateMachineDiagramTestCase(String name) {
- super(name);
- }
-
- public DiagramEditPart getDiagramEditPart() {
- assertNotNull(getDiagramWorkbenchPart());
- return getDiagramWorkbenchPart().getDiagramEditPart();
- }
-
- public IDiagramWorkbenchPart getDiagramWorkbenchPart() {
- return diagramWorkbenchPart;
- }
-
- public void flushEventQueue() {
- Display display = Display.getDefault();
- while (display.readAndDispatch()) {
- // do nothing
- }
- }
-
- protected void setUp() throws Exception {
- createProject();
-
- diagramResource = createDiagram();
- openDiagram();
-
- flushEventQueue();
- }
-
- protected void tearDown() throws Exception {
- flushEventQueue();
-
- closeDiagram();
-
- diagramResource.unload();
- diagramResource = null;
-
- closeProject();
- }
-
- protected Resource createDiagram() throws Exception {
- return UMLDiagramEditorUtil.createDiagram(getDiagramModelURI(), getDomainModelURI(), new NullProgressMonitor());
- }
-
- protected URI getDiagramModelURI() {
- String projectPath = getProject().getFullPath().toString();
- return URI.createPlatformResourceURI(projectPath + "/test.umlstatemachine_diagram", false); //$NON-NLS-1$
- }
-
- protected URI getDomainModelURI() {
- String projectPath = getProject().getFullPath().toString();
- return URI.createPlatformResourceURI(projectPath + "/test.uml", false); //$NON-NLS-1$
- }
-
- private void createProject() throws Exception {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceRoot wsroot = workspace.getRoot();
-
- project = wsroot.getProject(getProjectName());
-
- IProjectDescription desc =
- workspace.newProjectDescription(project.getName());
-
- if (!project.exists()) {
- project.create(desc, null);
- }
-
- if (!project.isOpen()) {
- project.open(null);
- }
- }
-
- private void closeProject() throws CoreException {
- try {
- project.delete(true, true, null);
- } finally {
- project = null;
- }
- }
-
- private IProject getProject() {
- return project;
- }
-
- private void openDiagram() throws PartInitException {
- String path = diagramResource.getURI().toPlatformString(true);
- IResource workspaceResource = ResourcesPlugin.getWorkspace().getRoot().findMember(new Path(path));
- if (workspaceResource instanceof IFile)
- {
- IWorkbench workbench = PlatformUI.getWorkbench();
- IWorkbenchPage page = workbench.getActiveWorkbenchWindow().getActivePage();
- IEditorPart editorPart = page.openEditor(new FileEditorInput((IFile)workspaceResource), workbench.getEditorRegistry().getDefaultEditor(workspaceResource.getFullPath().toString()).getId());
- setDiagramWorkbenchPart((IDiagramWorkbenchPart) editorPart);
- }
- }
-
- private void closeDiagram() {
- if (getDiagramWorkbenchPart() instanceof IEditorPart) {
- IWorkbenchPage page = getDiagramWorkbenchPart().getSite().getPage();
-
- page.closeEditor(
- (IEditorPart) getDiagramWorkbenchPart(),
- false);
- }
- setDiagramWorkbenchPart(null);
- }
-
- private String getProjectName() {
- return "state_machine_test_project"; //$NON-NLS-1$
- }
-
- private void setDiagramWorkbenchPart(IDiagramWorkbenchPart diagramWorkbenchPart) {
- this.diagramWorkbenchPart = diagramWorkbenchPart;
- }
-
- private IProject project;
- private Resource diagramResource;
- private IDiagramWorkbenchPart diagramWorkbenchPart;
-}
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/sync/SynchronizedDiagramContentTest.java b/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/sync/SynchronizedDiagramContentTest.java
deleted file mode 100644
index 5d3708b..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/sync/SynchronizedDiagramContentTest.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2007 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:
- * Sergey Gribovsky (Borland) - initial API and implementation
- */
-
-package org.eclipse.uml2.diagram.statemachine.tests.sync;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-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.NullProgressMonitor;
-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.ecore.xmi.XMIResource;
-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.services.ViewService;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.uml2.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.eclipse.uml2.diagram.statemachine.part.UMLDiagramEditorUtil;
-import org.eclipse.uml2.diagram.statemachine.tests.StateMachineDiagramTestCase;
-import org.eclipse.uml2.uml.FinalState;
-import org.eclipse.uml2.uml.Pseudostate;
-import org.eclipse.uml2.uml.PseudostateKind;
-import org.eclipse.uml2.uml.Region;
-import org.eclipse.uml2.uml.State;
-import org.eclipse.uml2.uml.StateMachine;
-import org.eclipse.uml2.uml.UMLFactory;
-import org.eclipse.uml2.uml.UMLPackage;
-
-
-public class SynchronizedDiagramContentTest extends StateMachineDiagramTestCase {
- public SynchronizedDiagramContentTest() {
- super("Content of synchronized diagram testing."); //$NON-NLS-1$
- }
-
- public void test_synchronizedContent() {
- flushEventQueue();
- DiagramEditPart diagramEditPart = getDiagramEditPart();
- assertNotNull("There is no diagram edit part.", diagramEditPart); //$NON-NLS-1$
-
- Diagram diagram = (Diagram) diagramEditPart.getModel();
- assertNotNull("Diagram edit part containts incorrect notation element.", diagram); //$NON-NLS-1$
-
- EList topLevelNodes = diagram.getChildren();
- assertEquals("Auxiliary secondary node is not found.", 1, topLevelNodes.size()); //$NON-NLS-1$
-
- View stateMachineNode = (View) topLevelNodes.get(0);
- assertNotNull("Auxiliary secondary node is null.", stateMachineNode); //$NON-NLS-1$
-
- EList stateMachineChildren = stateMachineNode.getChildren();
- View regionNode = null;
- boolean hasEntryPoint = false;
- boolean hasExitPoint = false;
- for (Iterator iterator = stateMachineChildren.iterator(); iterator.hasNext();) {
- View stateMachineChild = (View) iterator.next();
- EObject element = stateMachineChild.getElement();
- if (element instanceof Region) {
- regionNode = stateMachineChild;
- } else if (element instanceof Pseudostate) {
- PseudostateKind kind = ((Pseudostate) element).getKind();
- if (kind.equals(PseudostateKind.ENTRY_POINT_LITERAL)) {
- hasEntryPoint = true;
- } else if (kind.equals(PseudostateKind.EXIT_POINT_LITERAL)) {
- hasExitPoint = true;
- }
- }
- }
- assertNotNull("StateMachine node doesn't containt region.", regionNode); //$NON-NLS-1$
- assertTrue("StateMachine node doesn't containt entry point.", hasEntryPoint); //$NON-NLS-1$
- assertTrue("StateMachine node doesn't containt exit point.", hasExitPoint); //$NON-NLS-1$
-
- EList regionChildren = regionNode.getChildren();
- assertEquals("Region node doesn't containt subvertex compartment.", 1, regionChildren.size()); //$NON-NLS-1$
- View subvertexCompartment = (View) regionChildren.get(0);
- assertTrue("Region node doesn't containt subvertex compartment.", subvertexCompartment.getElement() instanceof Region); //$NON-NLS-1$
-
- EList subvertexCompartmentCildren = subvertexCompartment.getChildren();
- boolean hasFinalState = false;
- boolean hasSimpleState = false;
- boolean hasCompositeState = false;
- boolean hasInitial = false;
- boolean hasShallowHistory = false;
- boolean hasDeepHistory = false;
- boolean hasFork = false;
- boolean hasJoin = false;
- boolean hasJunction = false;
- boolean hasChoice = false;
- boolean hasTerminate = false;
- for (Iterator iterator = subvertexCompartmentCildren.iterator(); iterator.hasNext();) {
- View regionChild = (View) iterator.next();
- EObject element = regionChild.getElement();
- if (element instanceof FinalState) {
- hasFinalState = true;
- } else if (element instanceof State) {
- EList stateChildren = regionChild.getChildren();
- if (stateChildren.size() == 1) {
- hasSimpleState = true;
- } else if (stateChildren.size() == 2) {
- for (Iterator stateChildrenIterator = stateChildren.iterator(); stateChildrenIterator.hasNext();) {
- View stateChild = (View) stateChildrenIterator.next();
- if (stateChild.getElement() instanceof Region) {
- hasCompositeState = true;
- }
- }
- }
- } else if (element instanceof Pseudostate) {
- PseudostateKind kind = ((Pseudostate) element).getKind();
- if (PseudostateKind.INITIAL_LITERAL.equals(kind)) {
- hasInitial = true;
- } else if (PseudostateKind.SHALLOW_HISTORY_LITERAL.equals(kind)) {
- hasShallowHistory = true;
- } else if (PseudostateKind.DEEP_HISTORY_LITERAL.equals(kind)) {
- hasDeepHistory = true;
- } else if (PseudostateKind.FORK_LITERAL.equals(kind)) {
- hasFork = true;
- } else if (PseudostateKind.JOIN_LITERAL.equals(kind)) {
- hasJoin = true;
- } else if (PseudostateKind.JUNCTION_LITERAL.equals(kind)) {
- hasJunction = true;
- } else if (PseudostateKind.CHOICE_LITERAL.equals(kind)) {
- hasChoice = true;
- } else if (PseudostateKind.TERMINATE_LITERAL.equals(kind)) {
- hasTerminate = true;
- }
- }
- }
- assertTrue("Region node doesn't contain final state.", hasFinalState); //$NON-NLS-1$
- assertTrue("Region node doesn't contain simple state.", hasSimpleState); //$NON-NLS-1$
- assertTrue("Region node doesn't contain composite state.", hasCompositeState); //$NON-NLS-1$
- assertTrue("Region node doesn't contain initial pseudostate.", hasInitial); //$NON-NLS-1$
- assertTrue("Region node doesn't contain shallow history pseudostate.", hasShallowHistory); //$NON-NLS-1$
- assertTrue("Region node doesn't contain deep history pseudostate.", hasDeepHistory); //$NON-NLS-1$
- assertTrue("Region node doesn't contain fork pseudostate.", hasFork); //$NON-NLS-1$
- assertTrue("Region node doesn't contain join pseudostate.", hasJoin); //$NON-NLS-1$
- assertTrue("Region node doesn't contain junction pseudostate.", hasJunction); //$NON-NLS-1$
- assertTrue("Region node doesn't contain choice pseudostate.", hasChoice); //$NON-NLS-1$
- assertTrue("Region node doesn't contain terminate pseudostate.", hasTerminate); //$NON-NLS-1$
- }
-
- @Override
- protected Resource createDiagram() throws Exception {
- TransactionalEditingDomain editingDomain = GMFEditingDomainFactory.INSTANCE.createEditingDomain();
- URI diagramURI = getDiagramModelURI();
- URI modelURI = getDomainModelURI();
- final Resource diagramResource = editingDomain.getResourceSet().createResource(diagramURI);
- final Resource modelResource = editingDomain.getResourceSet().createResource(modelURI);
- final String diagramName = diagramURI.lastSegment();
- AbstractTransactionalCommand command = new AbstractTransactionalCommand(editingDomain, "Creating diagram and model", Collections.EMPTY_LIST) { //$NON-NLS-1$
-
- protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
- StateMachine model = createStateMachine();
- modelResource.getContents().add(model);
- Diagram diagram = ViewService.createDiagram(model, StateMachineEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
- if (diagram != null) {
- diagramResource.getContents().add(diagram);
- diagram.setName(diagramName);
- diagram.setElement(model);
- }
- try {
- Map<String,String> options = new HashMap<String,String>();
- options.put(XMIResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
- modelResource.save(options);
- diagramResource.save(options);
- } catch (IOException e) {
-
- UMLDiagramEditorPlugin.getInstance().logError("Unable to store model and diagram resources", e); //$NON-NLS-1$
- }
- return CommandResult.newOKCommandResult();
- }
- };
- try {
- OperationHistoryFactory.getOperationHistory().execute(command, new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- UMLDiagramEditorPlugin.getInstance().logError("Unable to create model and diagram", e); //$NON-NLS-1$
- }
-
- IFile modelFile = UMLDiagramEditorUtil.getFile(modelURI);
- modelFile.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$
-
- IFile diagramFile = UMLDiagramEditorUtil.getFile(diagramURI);
- diagramFile.setCharset("UTF-8", new NullProgressMonitor()); //$NON-NLS-1$
-
- return diagramResource;
- }
-
- private StateMachine createStateMachine() {
- StateMachine stateMachine = UMLFactory.eINSTANCE.createStateMachine();
- stateMachine.setName("State Machine"); //$NON-NLS-1$
- Pseudostate entryPoint = stateMachine.createConnectionPoint("Entry Point"); //$NON-NLS-1$
- entryPoint.setKind(PseudostateKind.ENTRY_POINT_LITERAL);
- Pseudostate exitPoint = stateMachine.createConnectionPoint("Exit Point"); //$NON-NLS-1$
- exitPoint.setKind(PseudostateKind.EXIT_POINT_LITERAL);
-
- Region region = stateMachine.createRegion("Region"); //$NON-NLS-1$
- region.createSubvertex("Simple State", UMLPackage.eINSTANCE.getState()); //$NON-NLS-1$
- State compositeState = (State) region.createSubvertex("Composite State", UMLPackage.eINSTANCE.getState()); //$NON-NLS-1$
- compositeState.createRegion("region"); //$NON-NLS-1$
- region.createSubvertex("Final State", UMLPackage.eINSTANCE.getFinalState()); //$NON-NLS-1$
-
- Pseudostate initial = (Pseudostate) region.createSubvertex("Initial Pseudostate", UMLPackage.eINSTANCE.getPseudostate()); //$NON-NLS-1$
- initial.setKind(PseudostateKind.INITIAL_LITERAL);
- Pseudostate shallowHistory = (Pseudostate) region.createSubvertex("Shallow History Pseudostate", UMLPackage.eINSTANCE.getPseudostate()); //$NON-NLS-1$
- shallowHistory.setKind(PseudostateKind.SHALLOW_HISTORY_LITERAL);
- Pseudostate deepHistory = (Pseudostate) region.createSubvertex("Deep History Pseudostate", UMLPackage.eINSTANCE.getPseudostate()); //$NON-NLS-1$
- deepHistory.setKind(PseudostateKind.DEEP_HISTORY_LITERAL);
- Pseudostate fork = (Pseudostate) region.createSubvertex("Fork Pseudostate", UMLPackage.eINSTANCE.getPseudostate()); //$NON-NLS-1$
- fork.setKind(PseudostateKind.FORK_LITERAL);
- Pseudostate join = (Pseudostate) region.createSubvertex("Join Pseudostate", UMLPackage.eINSTANCE.getPseudostate()); //$NON-NLS-1$
- join.setKind(PseudostateKind.JOIN_LITERAL);
- Pseudostate junction = (Pseudostate) region.createSubvertex("Junction Pseudostate", UMLPackage.eINSTANCE.getPseudostate()); //$NON-NLS-1$
- junction.setKind(PseudostateKind.JUNCTION_LITERAL);
- Pseudostate choice = (Pseudostate) region.createSubvertex("Choice Pseudostate", UMLPackage.eINSTANCE.getPseudostate()); //$NON-NLS-1$
- choice.setKind(PseudostateKind.CHOICE_LITERAL);
- Pseudostate terminate = (Pseudostate) region.createSubvertex("Terminate Pseudostate", UMLPackage.eINSTANCE.getPseudostate()); //$NON-NLS-1$
- terminate.setKind(PseudostateKind.TERMINATE_LITERAL);
- return stateMachine;
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/tools/CreationToolTest.java b/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/tools/CreationToolTest.java
deleted file mode 100644
index a095085..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/tools/CreationToolTest.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright (c) 2007 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:
- * Sergey Gribovsky (Borland) - initial API and implementation
- */
-
-package org.eclipse.uml2.diagram.statemachine.tests.tools;
-
-import java.util.Collections;
-
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeConnectionTool;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.gmf.runtime.notation.Node;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.FinalStateEditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.Pseudostate10EditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.Pseudostate2EditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.Pseudostate3EditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.Pseudostate4EditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.Pseudostate5EditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.Pseudostate6EditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.Pseudostate7EditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.Pseudostate8EditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.Pseudostate9EditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.PseudostateEditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.RegionEditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.RegionSubverticesEditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.State2EditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.StateEditPart;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.StateMachine2EditPart;
-import org.eclipse.uml2.diagram.statemachine.part.UMLVisualIDRegistry;
-import org.eclipse.uml2.diagram.statemachine.providers.UMLElementTypes;
-import org.eclipse.uml2.diagram.statemachine.tests.StateMachineDiagramTestCase;
-import org.eclipse.uml2.uml.Pseudostate;
-import org.eclipse.uml2.uml.PseudostateKind;
-import org.eclipse.uml2.uml.State;
-
-
-public class CreationToolTest extends StateMachineDiagramTestCase {
- public CreationToolTest() {
- super("Testing element creation by tools"); //$NON-NLS-1$
- }
-
- public void test_topLevelEditPart() {
- IGraphicalEditPart statemachineEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachine2EditPart.VISUAL_ID));
- assertNotNull("Top level edit part is not found.", statemachineEditPart); //$NON-NLS-1$
- }
-
- public void test_regionCreation() throws Exception {
- createNodeByTool(UMLElementTypes.Region_3013);
-
- IGraphicalEditPart statemachineEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachine2EditPart.VISUAL_ID));
- assertNotNull("StateMachine edit part was not found.", statemachineEditPart); //$NON-NLS-1$
- IGraphicalEditPart regionEditPart =
- statemachineEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(RegionEditPart.VISUAL_ID));
- assertNotNull("Region was not created.", regionEditPart); //$NON-NLS-1$
- }
-
- public void test_entryExitPointCreation() {
- createNodeByTool(UMLElementTypes.Pseudostate_3014);
- createNodeByTool(UMLElementTypes.Pseudostate_3015);
-
- IGraphicalEditPart statemachineEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachine2EditPart.VISUAL_ID));
- assertNotNull("StateMachine edit part was not found.", statemachineEditPart); //$NON-NLS-1$
-
- IGraphicalEditPart entryPointEditPart =
- statemachineEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Pseudostate9EditPart.VISUAL_ID));
- assertNotNull("Entry point was not created.", entryPointEditPart); //$NON-NLS-1$
- assertEquals("Created entry point had incorrect kind.", //$NON-NLS-1$
- PseudostateKind.ENTRY_POINT_LITERAL,
- ((Pseudostate) ((Node) entryPointEditPart.getModel()).getElement()).getKind());
-
-
- IGraphicalEditPart exitPointEditPart =
- statemachineEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Pseudostate10EditPart.VISUAL_ID));
- assertNotNull("Entry point was not created.", exitPointEditPart); //$NON-NLS-1$
- assertEquals("Created exit point had incorrect kind.", //$NON-NLS-1$
- PseudostateKind.EXIT_POINT_LITERAL,
- ((Pseudostate) ((Node) exitPointEditPart.getModel()).getElement()).getKind());
- }
-
- public void test_stateCreation() {
- IGraphicalEditPart statemachineEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachine2EditPart.VISUAL_ID));
- assertNotNull("StateMachine edit part was not found.", statemachineEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.Region_3013);
-
- IGraphicalEditPart regionEditPart =
- statemachineEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(RegionEditPart.VISUAL_ID));
- assertNotNull("Region edit part was not found.", regionEditPart); //$NON-NLS-1$
- IGraphicalEditPart subverticesEditPart =
- regionEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(RegionSubverticesEditPart.VISUAL_ID));
- assertNotNull("Region subvertices edit part was not found.", subverticesEditPart); //$NON-NLS-1$
-
- flushEventQueue();
-
- createNodeByTool(UMLElementTypes.State_3001);
-
- IGraphicalEditPart simpleStateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(StateEditPart.VISUAL_ID));
- assertNotNull("Simple state was not created.", simpleStateEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.State_3012);
- IGraphicalEditPart compositeStateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(State2EditPart.VISUAL_ID));
- assertNotNull("Composite state was not created.", compositeStateEditPart); //$NON-NLS-1$
- assertEquals("Created composite state didn't contain a region.", //$NON-NLS-1$
- 1,
- ((State) ((Node) compositeStateEditPart.getModel()).getElement()).getRegions().size());
-
- createNodeByTool(UMLElementTypes.FinalState_3003);
- IGraphicalEditPart finalStateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(FinalStateEditPart.VISUAL_ID));
- assertNotNull("Final state was not created.", finalStateEditPart); //$NON-NLS-1$
- }
-
- public void test_pseudostateCreation() {
- IGraphicalEditPart statemachineEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachine2EditPart.VISUAL_ID));
- assertNotNull("StateMachine edit part was not found.", statemachineEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.Region_3013);
-
- IGraphicalEditPart regionEditPart =
- statemachineEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(RegionEditPart.VISUAL_ID));
- assertNotNull("Region edit part was not found.", regionEditPart); //$NON-NLS-1$
- IGraphicalEditPart subverticesEditPart =
- regionEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(RegionSubverticesEditPart.VISUAL_ID));
- assertNotNull("Region subvertices edit part was not found.", subverticesEditPart); //$NON-NLS-1$
-
- flushEventQueue();
-
- createNodeByTool(UMLElementTypes.Pseudostate_3004);
- IGraphicalEditPart initialPseudostateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(PseudostateEditPart.VISUAL_ID));
- assertNotNull("Initial pseudostate was not created.", initialPseudostateEditPart); //$NON-NLS-1$
- assertEquals("Created pseudostate had incorrect kind.", //$NON-NLS-1$
- PseudostateKind.INITIAL_LITERAL,
- ((Pseudostate) ((Node) initialPseudostateEditPart.getModel()).getElement()).getKind());
-
- createNodeByTool(UMLElementTypes.Pseudostate_3005);
- IGraphicalEditPart shallowHistoryPseudostateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Pseudostate2EditPart.VISUAL_ID));
- assertNotNull("Shallow history pseudostate was not created.", shallowHistoryPseudostateEditPart); //$NON-NLS-1$
- assertEquals("Created pseudostate had incorrect kind.", //$NON-NLS-1$
- PseudostateKind.SHALLOW_HISTORY_LITERAL,
- ((Pseudostate) ((Node) shallowHistoryPseudostateEditPart.getModel()).getElement()).getKind());
-
- createNodeByTool(UMLElementTypes.Pseudostate_3006);
- IGraphicalEditPart deepHistoryPseudostateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Pseudostate3EditPart.VISUAL_ID));
- assertNotNull("Deep history pseudostate was not created.", deepHistoryPseudostateEditPart); //$NON-NLS-1$
- assertEquals("Created pseudostate had incorrect kind.", //$NON-NLS-1$
- PseudostateKind.DEEP_HISTORY_LITERAL,
- ((Pseudostate) ((Node) deepHistoryPseudostateEditPart.getModel()).getElement()).getKind());
-
- createNodeByTool(UMLElementTypes.Pseudostate_3007);
- IGraphicalEditPart forkPseudostateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Pseudostate4EditPart.VISUAL_ID));
- assertNotNull("Fork pseudostate was not created.", forkPseudostateEditPart); //$NON-NLS-1$
- assertEquals("Created pseudostate had incorrect kind.", //$NON-NLS-1$
- PseudostateKind.FORK_LITERAL,
- ((Pseudostate) ((Node) forkPseudostateEditPart.getModel()).getElement()).getKind());
-
- createNodeByTool(UMLElementTypes.Pseudostate_3008);
- IGraphicalEditPart joinPseudostateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Pseudostate5EditPart.VISUAL_ID));
- assertNotNull("Join pseudostate was not created.", joinPseudostateEditPart); //$NON-NLS-1$
- assertEquals("Created pseudostate had incorrect kind.", //$NON-NLS-1$
- PseudostateKind.JOIN_LITERAL,
- ((Pseudostate) ((Node) joinPseudostateEditPart.getModel()).getElement()).getKind());
-
- createNodeByTool(UMLElementTypes.Pseudostate_3009);
- IGraphicalEditPart junctionPseudostateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Pseudostate6EditPart.VISUAL_ID));
- assertNotNull("Junction pseudostate was not created.", junctionPseudostateEditPart); //$NON-NLS-1$
- assertEquals("Created pseudostate had incorrect kind.", //$NON-NLS-1$
- PseudostateKind.JUNCTION_LITERAL,
- ((Pseudostate) ((Node) junctionPseudostateEditPart.getModel()).getElement()).getKind());
-
- createNodeByTool(UMLElementTypes.Pseudostate_3010);
- IGraphicalEditPart choicePseudostateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Pseudostate7EditPart.VISUAL_ID));
- assertNotNull("Junction pseudostate was not created.", choicePseudostateEditPart); //$NON-NLS-1$
- assertEquals("Choice pseudostate had incorrect kind.", //$NON-NLS-1$
- PseudostateKind.CHOICE_LITERAL,
- ((Pseudostate) ((Node) choicePseudostateEditPart.getModel()).getElement()).getKind());
-
- createNodeByTool(UMLElementTypes.Pseudostate_3011);
- IGraphicalEditPart terminatePseudostateEditPart =
- subverticesEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(Pseudostate8EditPart.VISUAL_ID));
- assertNotNull("Terminate pseudostate was not created.", terminatePseudostateEditPart); //$NON-NLS-1$
- assertEquals("Choice pseudostate had incorrect kind.", //$NON-NLS-1$
- PseudostateKind.TERMINATE_LITERAL,
- ((Pseudostate) ((Node) terminatePseudostateEditPart.getModel()).getElement()).getKind());
- }
-
- public void test_transitionCreation() {
- IGraphicalEditPart statemachineEditPart =
- getDiagramEditPart().getChildBySemanticHint(UMLVisualIDRegistry.getType(StateMachine2EditPart.VISUAL_ID));
- assertNotNull("StateMachine edit part was not found.", statemachineEditPart); //$NON-NLS-1$
-
- createNodeByTool(UMLElementTypes.Region_3013);
-
- IGraphicalEditPart regionEditPart =
- statemachineEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(RegionEditPart.VISUAL_ID));
- assertNotNull("Region edit part was not found.", regionEditPart); //$NON-NLS-1$
- IGraphicalEditPart subverticesEditPart =
- regionEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(RegionSubverticesEditPart.VISUAL_ID));
- assertNotNull("Region subvertices edit part was not found.", subverticesEditPart); //$NON-NLS-1$
-
- flushEventQueue();
-
- createNodeByTool(UMLElementTypes.State_3001);
- createNodeByTool(UMLElementTypes.State_3001);
-
- getDiagramEditPart().getViewer().setSelection(new StructuredSelection(subverticesEditPart.getChildren()));
-
- createConnectionByTool(UMLElementTypes.Transition_4001);
-
- assertEquals("Transition wasn't created.", 1, getDiagramEditPart().getConnections().size()); //$NON-NLS-1$
- }
-
- private void createConnectionByTool(IElementType elementType) {
- UnspecifiedTypeConnectionTool tool = new UnspecifiedTypeConnectionTool(Collections.singletonList(elementType));
- tool.setEditDomain((EditDomain) getDiagramWorkbenchPart().getDiagramEditDomain());
- tool.activate();
- tool.mouseDoubleClick(createMouseEvent(0, 0), getDiagramEditPart().getViewer());
- tool.deactivate();
- }
-
- private void createNodeByTool(IElementType elementType) {
- createNodeByTool(elementType, 70, 70);
- }
-
- private void createNodeByTool(IElementType elementType, int x, int y) {
- UnspecifiedTypeCreationTool tool = new UnspecifiedTypeCreationTool(Collections.singletonList(elementType));
- tool.setEditDomain((EditDomain) getDiagramWorkbenchPart().getDiagramEditDomain());
- tool.activate();
- tool.mouseMove(createMouseEvent(x, y), getDiagramEditPart().getViewer());
- tool.mouseDown(createMouseEvent(x, y), getDiagramEditPart().getViewer());
- tool.mouseUp(createMouseEvent(x, y), getDiagramEditPart().getViewer());
- tool.deactivate();
- }
-
- private 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/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/whole/TestWholeDiagramSuite.java b/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/whole/TestWholeDiagramSuite.java
deleted file mode 100644
index a4843d1..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/whole/TestWholeDiagramSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.eclipse.uml2.diagram.statemachine.tests.whole;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-public class TestWholeDiagramSuite extends TestSuite {
-
- public TestWholeDiagramSuite() {
- for (String name : oursDiagramFiles) {
- addTest(new TestWholeStateMDiagram(name + ".uml", name + ".umlstatemachine_diagram"));
- }
-
- }
-
- private static List<String> oursDiagramFiles = new ArrayList<String>();
- static {
- oursDiagramFiles.add("15.22.Junction");
- oursDiagramFiles.add("15.25.Fork and Join");
- oursDiagramFiles.add("15.32.State with compartments");
- oursDiagramFiles.add("15.35.Orthogonal state with regions");
- oursDiagramFiles.add("15.38.State machine with exit point on the border of the statemachine");
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/whole/TestWholeStateMDiagram.java b/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/whole/TestWholeStateMDiagram.java
deleted file mode 100644
index 6d622c3..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/src/org/eclipse/uml2/diagram/statemachine/tests/whole/TestWholeStateMDiagram.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.uml2.diagram.statemachine.tests.whole;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collections;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.uml2.diagram.common.wholediagram.TestWholeDiagram;
-import org.eclipse.uml2.diagram.common.wholediagram.UMLInitDiagramFacade;
-import org.eclipse.uml2.diagram.statemachine.edit.parts.StateMachineEditPart;
-import org.eclipse.uml2.diagram.statemachine.part.UMLDiagramEditor;
-import org.eclipse.uml2.diagram.statemachine.part.UMLDiagramEditorPlugin;
-import org.osgi.framework.Bundle;
-
-public class TestWholeStateMDiagram extends TestWholeDiagram {
-
- public TestWholeStateMDiagram(String modelFileName, String diagramFileName) {
- super(modelFileName, diagramFileName);
- }
-
- @Override
- protected UMLInitDiagramFacade getInitDiagramFacade(IFile modelFile, IFile diagramFile) {
- return new UMLInitDiagramFacade(modelFile, diagramFile, UMLDiagramEditor.ID) {
-
- @Override
- protected Diagram createDiagramView(EObject modelRoot) {
- return ViewService.createDiagram(modelRoot, StateMachineEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
- }
-
- };
- }
-
- @Override
- protected URL findFileInTestPlugin(String fileName) {
- return FileLocator.find(UML_TEST_BUNDLE, new Path(EXAMPLE_FOLDER).append(fileName), Collections.EMPTY_MAP);
- }
-
- @Override
- protected boolean ignoreView(int visualId) {
- return super.ignoreView(visualId);
- }
-
- private final static Bundle UML_TEST_BUNDLE = Platform.getBundle("org.eclipse.uml2.diagram.statemachine.tests");
-
- private final static String EXAMPLE_FOLDER = "examples/";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.statemachine.tests/test.xml b/tests/org.eclipse.uml2.diagram.statemachine.tests/test.xml
deleted file mode 100644
index 50e5461..0000000
--- a/tests/org.eclipse.uml2.diagram.statemachine.tests/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<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.uml2.diagram.statemachine.tests"/>
- <property name="library-file" value="${eclipse-home}/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="uml2-tools-folder" value="${eclipse-home}/uml2_tools_folder"/>
- <delete dir="${uml2-tools-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${uml2-tools-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.uml2.diagram.statemachine.tests.AllNonUITests"/>
- <property name="vmargs" value="-ea -Xmx512M"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/.classpath b/tests/org.eclipse.uml2.diagram.usecase.tests/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/.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/tests/org.eclipse.uml2.diagram.usecase.tests/.project b/tests/org.eclipse.uml2.diagram.usecase.tests/.project
deleted file mode 100644
index c0c00fa..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2.diagram.usecase.tests</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/tests/org.eclipse.uml2.diagram.usecase.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.uml2.diagram.usecase.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 121bbd9..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Apr 10 15:07:56 CEST 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/tests/org.eclipse.uml2.diagram.usecase.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.uml2.diagram.usecase.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 0caba99..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.uml2.diagram.usecase.tests;singleton:=true
-Bundle-Version: 0.7.1.qualifier
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Require-Bundle: org.junit;bundle-version="3.8.2",
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.emf.ecore,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.notation,
- org.eclipse.gmf.runtime.common.ui,
- org.eclipse.gmf.runtime.emf.type.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.ui.ide;bundle-version="3.4.0",
- org.eclipse.uml2.diagram.common.tests;bundle-version="0.7.1",
- org.eclipse.uml2.diagram.usecase;bundle-version="0.8.0"
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/about.html b/tests/org.eclipse.uml2.diagram.usecase.tests/about.html
deleted file mode 100644
index 1b8f940..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/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 ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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/tests/org.eclipse.uml2.diagram.usecase.tests/build.properties b/tests/org.eclipse.uml2.diagram.usecase.tests/build.properties
deleted file mode 100644
index 0c2916b..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- plugin.xml,\
- examples/,\
- test.xml,\
- plugin.properties
-src.includes = about.html,\
- test.xml
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml b/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml
deleted file mode 100644
index f78dd58..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_sbVPEKMhEdyv8ePVS08H-g" name="F 16.10">
- <elementImport xmi:id="_sb7sAKMhEdyv8ePVS08H-g">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_sb7sAaMhEdyv8ePVS08H-g">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_sb8TEKMhEdyv8ePVS08H-g">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_sb8TEaMhEdyv8ePVS08H-g">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Component" xmi:id="_vSC9gKMhEdyv8ePVS08H-g" name="Telephone Catalog" useCase="_OF8FIAcSEd2UQt1e5EP-lA _SR3TAAcSEd2UQt1e5EP-lA _VIjzUAcSEd2UQt1e5EP-lA _YD3t4AcSEd2UQt1e5EP-lA">
- <ownedUseCase xmi:id="_x_I14KMhEdyv8ePVS08H-g" name="Check Status"/>
- <ownedUseCase xmi:id="_zYmjMKMhEdyv8ePVS08H-g" name="Place Orders"/>
- <ownedUseCase xmi:id="_0kw0UKMhEdyv8ePVS08H-g" name="Fill Orders"/>
- <ownedUseCase xmi:id="_2zsxEKMhEdyv8ePVS08H-g" name="Establish Credit"/>
- <ownedUseCase xmi:id="_OF8FIAcSEd2UQt1e5EP-lA" name="Fill Orders" subject="_vSC9gKMhEdyv8ePVS08H-g"/>
- <ownedUseCase xmi:id="_SR3TAAcSEd2UQt1e5EP-lA" name="Place Orders" subject="_vSC9gKMhEdyv8ePVS08H-g"/>
- <ownedUseCase xmi:id="_VIjzUAcSEd2UQt1e5EP-lA" name="Check Status" subject="_vSC9gKMhEdyv8ePVS08H-g"/>
- <ownedUseCase xmi:id="_YD3t4AcSEd2UQt1e5EP-lA" name="Establish Credit" subject="_vSC9gKMhEdyv8ePVS08H-g"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Actor" xmi:id="_4tK0IKMhEdyv8ePVS08H-g" name="Sales Person"/>
- <packagedElement xmi:type="uml:Actor" xmi:id="_-h7oEKMhEdyv8ePVS08H-g" name="Shipping Clerk"/>
- <packagedElement xmi:type="uml:Actor" xmi:id="_Dq5F8KMiEdyv8ePVS08H-g" name="Customer"/>
- <packagedElement xmi:type="uml:Association" xmi:id="_F52Q0KMiEdyv8ePVS08H-g" memberEnd="_F56iQKMiEdyv8ePVS08H-g _F58-gaMiEdyv8ePVS08H-g" navigableOwnedEnd="_F56iQKMiEdyv8ePVS08H-g _F58-gaMiEdyv8ePVS08H-g">
- <ownedEnd xmi:id="_F56iQKMiEdyv8ePVS08H-g" name="src" type="_Dq5F8KMiEdyv8ePVS08H-g" association="_F52Q0KMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F58-gKMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F58XcKMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_F58-gaMiEdyv8ePVS08H-g" name="dst" type="_x_I14KMhEdyv8ePVS08H-g" association="_F52Q0KMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_F59lkaMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_F59lkKMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_G4BwUKMiEdyv8ePVS08H-g" memberEnd="_G4CXYKMiEdyv8ePVS08H-g _G4C-caMiEdyv8ePVS08H-g" navigableOwnedEnd="_G4CXYKMiEdyv8ePVS08H-g _G4C-caMiEdyv8ePVS08H-g">
- <ownedEnd xmi:id="_G4CXYKMiEdyv8ePVS08H-g" name="src" type="_Dq5F8KMiEdyv8ePVS08H-g" association="_G4BwUKMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4C-cKMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G4CXYaMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_G4C-caMiEdyv8ePVS08H-g" name="dst" type="_2zsxEKMhEdyv8ePVS08H-g" association="_G4BwUKMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_G4DlgKMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_G4C-cqMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_Ihm9QKMiEdyv8ePVS08H-g" memberEnd="_IhnkUKMiEdyv8ePVS08H-g _IhoLYKMiEdyv8ePVS08H-g" navigableOwnedEnd="_IhnkUKMiEdyv8ePVS08H-g _IhoLYKMiEdyv8ePVS08H-g">
- <ownedEnd xmi:id="_IhnkUKMiEdyv8ePVS08H-g" name="src" type="_Dq5F8KMiEdyv8ePVS08H-g" association="_Ihm9QKMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IhnkUqMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IhnkUaMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_IhoLYKMiEdyv8ePVS08H-g" name="dst" type="_zYmjMKMhEdyv8ePVS08H-g" association="_Ihm9QKMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_IhoLYqMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_IhoLYaMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_KKRkMKMiEdyv8ePVS08H-g" memberEnd="_KKUngKMiEdyv8ePVS08H-g _KKVOkqMiEdyv8ePVS08H-g" navigableOwnedEnd="_KKUngKMiEdyv8ePVS08H-g _KKVOkqMiEdyv8ePVS08H-g">
- <ownedEnd xmi:id="_KKUngKMiEdyv8ePVS08H-g" name="src" type="_x_I14KMhEdyv8ePVS08H-g" association="_KKRkMKMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KKVOkaMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KKVOkKMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_KKVOkqMiEdyv8ePVS08H-g" name="dst" type="_4tK0IKMhEdyv8ePVS08H-g" association="_KKRkMKMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KKV1oaMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KKV1oKMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_LR7v0KMiEdyv8ePVS08H-g" memberEnd="_LR8W4KMiEdyv8ePVS08H-g _LR898qMiEdyv8ePVS08H-g" navigableOwnedEnd="_LR8W4KMiEdyv8ePVS08H-g _LR898qMiEdyv8ePVS08H-g">
- <ownedEnd xmi:id="_LR8W4KMiEdyv8ePVS08H-g" name="src" type="_4tK0IKMhEdyv8ePVS08H-g" association="_LR7v0KMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LR898aMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LR898KMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_LR898qMiEdyv8ePVS08H-g" name="dst" type="_zYmjMKMhEdyv8ePVS08H-g" association="_LR7v0KMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LR9lAaMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LR9lAKMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_OnjAwKMiEdyv8ePVS08H-g" memberEnd="_OnjAwaMiEdyv8ePVS08H-g _Onjn0qMiEdyv8ePVS08H-g" navigableOwnedEnd="_OnjAwaMiEdyv8ePVS08H-g _Onjn0qMiEdyv8ePVS08H-g">
- <ownedEnd xmi:id="_OnjAwaMiEdyv8ePVS08H-g" name="src" type="_0kw0UKMhEdyv8ePVS08H-g" association="_OnjAwKMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Onjn0aMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Onjn0KMiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_Onjn0qMiEdyv8ePVS08H-g" name="dst" type="_-h7oEKMhEdyv8ePVS08H-g" association="_OnjAwKMiEdyv8ePVS08H-g">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Onjn1KMiEdyv8ePVS08H-g" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Onjn06MiEdyv8ePVS08H-g" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_QJX8gAcSEd2UQt1e5EP-lA" memberEnd="_QJX8gQcSEd2UQt1e5EP-lA _QJX8hAcSEd2UQt1e5EP-lA" navigableOwnedEnd="_QJX8gQcSEd2UQt1e5EP-lA _QJX8hAcSEd2UQt1e5EP-lA">
- <ownedEnd xmi:id="_QJX8gQcSEd2UQt1e5EP-lA" name="src" type="_-h7oEKMhEdyv8ePVS08H-g" association="_QJX8gAcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QJX8gwcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QJX8ggcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_QJX8hAcSEd2UQt1e5EP-lA" name="dst" type="_OF8FIAcSEd2UQt1e5EP-lA" association="_QJX8gAcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_QJX8hgcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_QJX8hQcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_Tfp70AcSEd2UQt1e5EP-lA" memberEnd="_Tfp70QcSEd2UQt1e5EP-lA _Tfp71AcSEd2UQt1e5EP-lA" navigableOwnedEnd="_Tfp70QcSEd2UQt1e5EP-lA _Tfp71AcSEd2UQt1e5EP-lA">
- <ownedEnd xmi:id="_Tfp70QcSEd2UQt1e5EP-lA" name="src" type="_4tK0IKMhEdyv8ePVS08H-g" association="_Tfp70AcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Tfp70wcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Tfp70gcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_Tfp71AcSEd2UQt1e5EP-lA" name="dst" type="_SR3TAAcSEd2UQt1e5EP-lA" association="_Tfp70AcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Tfp71gcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Tfp71QcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_ULwz4AcSEd2UQt1e5EP-lA" memberEnd="_ULwz4QcSEd2UQt1e5EP-lA _ULwz5AcSEd2UQt1e5EP-lA" navigableOwnedEnd="_ULwz4QcSEd2UQt1e5EP-lA _ULwz5AcSEd2UQt1e5EP-lA">
- <ownedEnd xmi:id="_ULwz4QcSEd2UQt1e5EP-lA" name="src" type="_SR3TAAcSEd2UQt1e5EP-lA" association="_ULwz4AcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ULwz4wcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ULwz4gcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_ULwz5AcSEd2UQt1e5EP-lA" name="dst" type="_Dq5F8KMiEdyv8ePVS08H-g" association="_ULwz4AcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ULwz5gcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ULwz5QcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_WrgMwAcSEd2UQt1e5EP-lA" memberEnd="_WrgMwQcSEd2UQt1e5EP-lA _WrgMxAcSEd2UQt1e5EP-lA" navigableOwnedEnd="_WrgMwQcSEd2UQt1e5EP-lA _WrgMxAcSEd2UQt1e5EP-lA">
- <ownedEnd xmi:id="_WrgMwQcSEd2UQt1e5EP-lA" name="src" type="_Dq5F8KMiEdyv8ePVS08H-g" association="_WrgMwAcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WrgMwwcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WrgMwgcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_WrgMxAcSEd2UQt1e5EP-lA" name="dst" type="_VIjzUAcSEd2UQt1e5EP-lA" association="_WrgMwAcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WrgMxgcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WrgMxQcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_XWkjAAcSEd2UQt1e5EP-lA" memberEnd="_XWkjAQcSEd2UQt1e5EP-lA _XWkjBAcSEd2UQt1e5EP-lA" navigableOwnedEnd="_XWkjAQcSEd2UQt1e5EP-lA _XWkjBAcSEd2UQt1e5EP-lA">
- <ownedEnd xmi:id="_XWkjAQcSEd2UQt1e5EP-lA" name="src" type="_VIjzUAcSEd2UQt1e5EP-lA" association="_XWkjAAcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XWkjAwcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XWkjAgcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_XWkjBAcSEd2UQt1e5EP-lA" name="dst" type="_4tK0IKMhEdyv8ePVS08H-g" association="_XWkjAAcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_XWkjBgcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_XWkjBQcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- </packagedElement>
- <packagedElement xmi:type="uml:Association" xmi:id="_Za5LMAcSEd2UQt1e5EP-lA" memberEnd="_Za5LMQcSEd2UQt1e5EP-lA _Za5LNAcSEd2UQt1e5EP-lA" navigableOwnedEnd="_Za5LMQcSEd2UQt1e5EP-lA _Za5LNAcSEd2UQt1e5EP-lA">
- <ownedEnd xmi:id="_Za5LMQcSEd2UQt1e5EP-lA" name="src" type="_Dq5F8KMiEdyv8ePVS08H-g" association="_Za5LMAcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Za5LMwcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Za5LMgcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- <ownedEnd xmi:id="_Za5LNAcSEd2UQt1e5EP-lA" name="dst" type="_YD3t4AcSEd2UQt1e5EP-lA" association="_Za5LMAcSEd2UQt1e5EP-lA">
- <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Za5LNgcSEd2UQt1e5EP-lA" value="1"/>
- <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Za5LNQcSEd2UQt1e5EP-lA" value="1"/>
- </ownedEnd>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.umlusecase_diagram b/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.umlusecase_diagram
deleted file mode 100644
index 845eb12..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.umlusecase_diagram
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_sb9hMKMhEdyv8ePVS08H-g" type="UMLUseCase" name="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.umlusecase_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_sqtH0KMhEdyv8ePVS08H-g" type="2001">
- <children xmi:type="notation:Node" xmi:id="_sqtu4KMhEdyv8ePVS08H-g" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_squV8KMhEdyv8ePVS08H-g" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_squV8aMhEdyv8ePVS08H-g" collapsed="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_squV8qMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_squV86MhEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_sqtH0aMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Package" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_sbVPEKMhEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sqtH0qMhEdyv8ePVS08H-g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_vSK5UKMhEdyv8ePVS08H-g" type="2006">
- <children xmi:type="notation:Node" xmi:id="_vSLgYKMhEdyv8ePVS08H-g" type="5007"/>
- <children xmi:type="notation:Node" xmi:id="_vSLgYaMhEdyv8ePVS08H-g" type="7004">
- <children xmi:type="notation:Node" xmi:id="_OGF2IAcSEd2UQt1e5EP-lA" type="3004">
- <children xmi:type="notation:Node" xmi:id="_OGF2IwcSEd2UQt1e5EP-lA" type="5006"/>
- <children xmi:type="notation:Node" xmi:id="_OGF2JAcSEd2UQt1e5EP-lA" type="7005">
- <styles xmi:type="notation:SortingStyle" xmi:id="_OGF2JQcSEd2UQt1e5EP-lA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_OGF2JgcSEd2UQt1e5EP-lA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_OGF2IQcSEd2UQt1e5EP-lA"/>
- <element xmi:type="uml:UseCase" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_OF8FIAcSEd2UQt1e5EP-lA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OGF2IgcSEd2UQt1e5EP-lA" x="325" y="314"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_SR3TAQcSEd2UQt1e5EP-lA" type="3004">
- <children xmi:type="notation:Node" xmi:id="_SR3TBAcSEd2UQt1e5EP-lA" type="5006"/>
- <children xmi:type="notation:Node" xmi:id="_SR3TBQcSEd2UQt1e5EP-lA" type="7005">
- <styles xmi:type="notation:SortingStyle" xmi:id="_SR3TBgcSEd2UQt1e5EP-lA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_SR3TBwcSEd2UQt1e5EP-lA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_SR3TAgcSEd2UQt1e5EP-lA"/>
- <element xmi:type="uml:UseCase" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_SR3TAAcSEd2UQt1e5EP-lA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SR3TAwcSEd2UQt1e5EP-lA" x="345" y="167"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_VIs9QAcSEd2UQt1e5EP-lA" type="3004">
- <children xmi:type="notation:Node" xmi:id="_VIs9QwcSEd2UQt1e5EP-lA" type="5006"/>
- <children xmi:type="notation:Node" xmi:id="_VIs9RAcSEd2UQt1e5EP-lA" type="7005">
- <styles xmi:type="notation:SortingStyle" xmi:id="_VIs9RQcSEd2UQt1e5EP-lA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_VIs9RgcSEd2UQt1e5EP-lA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_VIs9QQcSEd2UQt1e5EP-lA"/>
- <element xmi:type="uml:UseCase" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_VIjzUAcSEd2UQt1e5EP-lA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VIs9QgcSEd2UQt1e5EP-lA" x="104" y="59"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_YD3t4QcSEd2UQt1e5EP-lA" type="3004">
- <children xmi:type="notation:Node" xmi:id="_YEA30AcSEd2UQt1e5EP-lA" type="5006"/>
- <children xmi:type="notation:Node" xmi:id="_YEA30QcSEd2UQt1e5EP-lA" type="7005">
- <styles xmi:type="notation:SortingStyle" xmi:id="_YEA30gcSEd2UQt1e5EP-lA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_YEA30wcSEd2UQt1e5EP-lA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_YD3t4gcSEd2UQt1e5EP-lA"/>
- <element xmi:type="uml:UseCase" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_YD3t4AcSEd2UQt1e5EP-lA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YD3t4wcSEd2UQt1e5EP-lA" x="68" y="305"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_vSLgYqMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_vSLgY6MhEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_vSK5UaMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Component" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_vSC9gKMhEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_vSK5UqMhEdyv8ePVS08H-g" x="264" y="60" width="529" height="457"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_4tgyYKMhEdyv8ePVS08H-g" type="2002">
- <children xmi:type="notation:Node" xmi:id="_4tiAgKMhEdyv8ePVS08H-g" type="5002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_4tiAgaMhEdyv8ePVS08H-g" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_4tgyYaMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Actor" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_4tK0IKMhEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4tgyYqMhEdyv8ePVS08H-g" x="949" y="168" height="37"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_-iOjAKMhEdyv8ePVS08H-g" type="2002">
- <children xmi:type="notation:Node" xmi:id="_-iPKEKMhEdyv8ePVS08H-g" type="5002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_-iPKEaMhEdyv8ePVS08H-g" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_-iOjAaMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Actor" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_-h7oEKMhEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-iOjAqMhEdyv8ePVS08H-g" x="955" y="348" height="68"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_DrIWgKMiEdyv8ePVS08H-g" type="2002">
- <children xmi:type="notation:Node" xmi:id="_DrI9kKMiEdyv8ePVS08H-g" type="5002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_DrI9kaMiEdyv8ePVS08H-g" x="-20" y="86"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_DrIWgaMiEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Actor" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_Dq5F8KMiEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DrIWgqMiEdyv8ePVS08H-g" x="122" y="223" height="66"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_sb9hMaMhEdyv8ePVS08H-g"/>
- <element xmi:type="uml:Package" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_sbVPEKMhEdyv8ePVS08H-g"/>
- <edges xmi:type="notation:Edge" xmi:id="_QJhGcAcSEd2UQt1e5EP-lA" type="4004" source="_-iOjAKMhEdyv8ePVS08H-g" target="_OGF2IAcSEd2UQt1e5EP-lA">
- <children xmi:type="notation:Node" xmi:id="_QJhGdAcSEd2UQt1e5EP-lA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QJhGdQcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_QJhGdgcSEd2UQt1e5EP-lA" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_QJhGdwcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_QJhGcQcSEd2UQt1e5EP-lA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_QJhGcgcSEd2UQt1e5EP-lA"/>
- <element xmi:type="uml:Association" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_QJX8gAcSEd2UQt1e5EP-lA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QJhGcwcSEd2UQt1e5EP-lA" points="[-15, 2, 240, -37]$[-236, 36, 19, -3]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QJhGeAcSEd2UQt1e5EP-lA" id="(0.8642857,0.36666667)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Tfp71wcSEd2UQt1e5EP-lA" type="4004" source="_4tgyYKMhEdyv8ePVS08H-g" target="_SR3TAQcSEd2UQt1e5EP-lA">
- <children xmi:type="notation:Node" xmi:id="_Tfp72wcSEd2UQt1e5EP-lA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Tfp73AcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Tfp73QcSEd2UQt1e5EP-lA" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Tfp73gcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_Tfp72AcSEd2UQt1e5EP-lA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Tfp72QcSEd2UQt1e5EP-lA"/>
- <element xmi:type="uml:Association" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_Tfp70AcSEd2UQt1e5EP-lA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Tfp72gcSEd2UQt1e5EP-lA" points="[-15, 5, 265, -91]$[-243, 126, 37, 30]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_ULwz5wcSEd2UQt1e5EP-lA" type="4004" source="_SR3TAQcSEd2UQt1e5EP-lA" target="_DrIWgKMiEdyv8ePVS08H-g">
- <children xmi:type="notation:Node" xmi:id="_ULwz6wcSEd2UQt1e5EP-lA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ULwz7AcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_ULwz7QcSEd2UQt1e5EP-lA" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_ULwz7gcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_ULwz6AcSEd2UQt1e5EP-lA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_ULwz6QcSEd2UQt1e5EP-lA"/>
- <element xmi:type="uml:Association" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_ULwz4AcSEd2UQt1e5EP-lA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ULwz6gcSEd2UQt1e5EP-lA" points="[-70, -5, 477, 21]$[-532, -49, 15, -23]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Wrp9wAcSEd2UQt1e5EP-lA" type="4004" source="_DrIWgKMiEdyv8ePVS08H-g" target="_VIs9QAcSEd2UQt1e5EP-lA">
- <children xmi:type="notation:Node" xmi:id="_Wrp9xAcSEd2UQt1e5EP-lA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Wrp9xQcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Wrp9xgcSEd2UQt1e5EP-lA" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Wrp9xwcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_Wrp9wQcSEd2UQt1e5EP-lA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Wrp9wgcSEd2UQt1e5EP-lA"/>
- <element xmi:type="uml:Association" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_WrgMwAcSEd2UQt1e5EP-lA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Wrp9wwcSEd2UQt1e5EP-lA" points="[15, -6, -247, 84]$[236, -95, -26, -5]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Wrp9yAcSEd2UQt1e5EP-lA" id="(0.18571429,0.36666667)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_XWkjBwcSEd2UQt1e5EP-lA" type="4004" source="_VIs9QAcSEd2UQt1e5EP-lA" target="_4tgyYKMhEdyv8ePVS08H-g">
- <children xmi:type="notation:Node" xmi:id="_XWkjCwcSEd2UQt1e5EP-lA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XWkjDAcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_XWkjDQcSEd2UQt1e5EP-lA" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XWkjDgcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_XWkjCAcSEd2UQt1e5EP-lA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_XWkjCQcSEd2UQt1e5EP-lA"/>
- <element xmi:type="uml:Association" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_XWkjAAcSEd2UQt1e5EP-lA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XWkjCgcSEd2UQt1e5EP-lA" points="[28, 2, -451, -24]$[464, 43, -15, 17]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XWkjDwcSEd2UQt1e5EP-lA" id="(0.8,0.28333333)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Za5LNwcSEd2UQt1e5EP-lA" type="4004" source="_DrIWgKMiEdyv8ePVS08H-g" target="_YD3t4QcSEd2UQt1e5EP-lA">
- <children xmi:type="notation:Node" xmi:id="_Za5LOwcSEd2UQt1e5EP-lA" type="6003">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Za5LPAcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Za5LPQcSEd2UQt1e5EP-lA" type="6004">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_Za5LPgcSEd2UQt1e5EP-lA" y="15"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_Za5LOAcSEd2UQt1e5EP-lA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Za5LOQcSEd2UQt1e5EP-lA"/>
- <element xmi:type="uml:Association" href="Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject.uml#_Za5LMAcSEd2UQt1e5EP-lA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Za5LOgcSEd2UQt1e5EP-lA" points="[18, 11, -255, -136]$[203, 147, -70, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Za5LPwcSEd2UQt1e5EP-lA" id="(0.4,0.77272725)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.3 - Example of an extend relationship between use cases.uml b/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.3 - Example of an extend relationship between use cases.uml
deleted file mode 100644
index d8a66a9..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.3 - Example of an extend relationship between use cases.uml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_JdgK0MjfEdy8VsoPkmWhvA">
- <elementImport xmi:id="_Je_YksjfEdy8VsoPkmWhvA">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_Je_Yk8jfEdy8VsoPkmWhvA">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_Je_YlMjfEdy8VsoPkmWhvA">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_Je_YlcjfEdy8VsoPkmWhvA">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_Mp8RoMjfEdy8VsoPkmWhvA" name="Perform ATM Transaction">
- <extensionPoint xmi:id="_N91icMjfEdy8VsoPkmWhvA" name="Selection"/>
- </packagedElement>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_RnVYsMjfEdy8VsoPkmWhvA" name="On-Line Help">
- <extend xmi:id="_XJYsAMjfEdy8VsoPkmWhvA" extendedCase="_Mp8RoMjfEdy8VsoPkmWhvA"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Constraint" xmi:id="_YKzFsMjfEdy8VsoPkmWhvA" name="Condition: {customer selected HELP} extension point: Selection" constrainedElement="_XJYsAMjfEdy8VsoPkmWhvA">
- <specification xmi:type="uml:LiteralString" xmi:id="_YKzFscjfEdy8VsoPkmWhvA" value="ValueSpecification"/>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.3 - Example of an extend relationship between use cases.umlusecase_diagram b/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.3 - Example of an extend relationship between use cases.umlusecase_diagram
deleted file mode 100644
index 4a181bb..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.3 - Example of an extend relationship between use cases.umlusecase_diagram
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_Je_YlsjfEdy8VsoPkmWhvA" type="UMLUseCase" name="Figure 16.3 - Example of an extend relationship between use cases.umlusecase_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_MqY9kMjfEdy8VsoPkmWhvA" type="2003">
- <children xmi:type="notation:Node" xmi:id="_MqY9k8jfEdy8VsoPkmWhvA" type="5003"/>
- <children xmi:type="notation:Node" xmi:id="_MqY9lMjfEdy8VsoPkmWhvA" type="7002">
- <children xmi:type="notation:Node" xmi:id="_N-IdYMjfEdy8VsoPkmWhvA" type="3002">
- <element xmi:type="uml:ExtensionPoint" href="Figure 16.3 - Example of an extend relationship between use cases.uml#_N91icMjfEdy8VsoPkmWhvA"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_N-IdYcjfEdy8VsoPkmWhvA"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_MqY9lcjfEdy8VsoPkmWhvA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_MqY9lsjfEdy8VsoPkmWhvA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_MqY9kcjfEdy8VsoPkmWhvA"/>
- <element xmi:type="uml:UseCase" href="Figure 16.3 - Example of an extend relationship between use cases.uml#_Mp8RoMjfEdy8VsoPkmWhvA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MqY9ksjfEdy8VsoPkmWhvA" x="120" y="288"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_RnfJsMjfEdy8VsoPkmWhvA" type="2003">
- <children xmi:type="notation:Node" xmi:id="_RnfJs8jfEdy8VsoPkmWhvA" type="5003"/>
- <children xmi:type="notation:Node" xmi:id="_RnfJtMjfEdy8VsoPkmWhvA" type="7002">
- <styles xmi:type="notation:SortingStyle" xmi:id="_RnfJtcjfEdy8VsoPkmWhvA"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_RnfJtsjfEdy8VsoPkmWhvA"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_RnfJscjfEdy8VsoPkmWhvA"/>
- <element xmi:type="uml:UseCase" href="Figure 16.3 - Example of an extend relationship between use cases.uml#_RnVYsMjfEdy8VsoPkmWhvA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RnfJssjfEdy8VsoPkmWhvA" x="540" y="276"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_YKzFssjfEdy8VsoPkmWhvA" type="2008">
- <children xmi:type="notation:Node" xmi:id="_YKzFtcjfEdy8VsoPkmWhvA" type="5011"/>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_YKzFs8jfEdy8VsoPkmWhvA"/>
- <element xmi:type="uml:Constraint" href="Figure 16.3 - Example of an extend relationship between use cases.uml#_YKzFsMjfEdy8VsoPkmWhvA"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YKzFtMjfEdy8VsoPkmWhvA" x="480" y="144" width="224"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_Je_Yl8jfEdy8VsoPkmWhvA"/>
- <element xmi:type="uml:Package" href="Figure 16.3 - Example of an extend relationship between use cases.uml#_JdgK0MjfEdy8VsoPkmWhvA"/>
- <edges xmi:type="notation:Edge" xmi:id="_XJYsAcjfEdy8VsoPkmWhvA" type="4002" source="_RnfJsMjfEdy8VsoPkmWhvA" target="_MqY9kMjfEdy8VsoPkmWhvA">
- <children xmi:type="notation:Node" xmi:id="_XJYsBcjfEdy8VsoPkmWhvA" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_XJYsBsjfEdy8VsoPkmWhvA" y="20"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_XJYsAsjfEdy8VsoPkmWhvA"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_XJYsA8jfEdy8VsoPkmWhvA"/>
- <element xmi:type="uml:Extend" href="Figure 16.3 - Example of an extend relationship between use cases.uml#_XJYsAMjfEdy8VsoPkmWhvA"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XJYsBMjfEdy8VsoPkmWhvA" points="[-25, -6, 136, 0]$[-156, -6, 5, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XJrm8MjfEdy8VsoPkmWhvA" id="(0.17857143,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_XJrm8cjfEdy8VsoPkmWhvA" id="(0.9774775,0.33333334)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_Ox78EMjjEdyQHuNdoqJ68A" type="4005" source="_YKzFssjfEdy8VsoPkmWhvA" target="_XJYsAcjfEdy8VsoPkmWhvA">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_Ox78EcjjEdyQHuNdoqJ68A"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_Ox78EsjjEdyQHuNdoqJ68A"/>
- <element xsi:nil="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ox78E8jjEdyQHuNdoqJ68A" points="[-3, 30, 12, -103]$[-14, 132, 1, -1]"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_OyYoAMjjEdyQHuNdoqJ68A" id="(0.5506329,0.6551724)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.7 - Example of use cases owned by various packages.uml b/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.7 - Example of use cases owned by various packages.uml
deleted file mode 100644
index e9d8053..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.7 - Example of use cases owned by various packages.uml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_E7pOEKMgEdy-S7gXKrJgrQ" name="F-16.7">
- <elementImport xmi:id="_E9NUUKMgEdy-S7gXKrJgrQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_E9N7YKMgEdy-S7gXKrJgrQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_E9N7YaMgEdy-S7gXKrJgrQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_E9N7YqMgEdy-S7gXKrJgrQ">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:Package" xmi:id="_IiHlgKMgEdy-S7gXKrJgrQ" name="TransactionUseCases">
- <packagedElement xmi:type="uml:UseCase" xmi:id="_LQl98KMgEdy-S7gXKrJgrQ" name="Card Identification"/>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_OQbMIKMgEdy-S7gXKrJgrQ" name="Perform ATM Transaction"/>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_S3CK4KMgEdy-S7gXKrJgrQ" name="On-Line Help">
- <extend xmi:id="_8oa-MKMgEdyv8ePVS08H-g" extendedCase="_OQbMIKMgEdy-S7gXKrJgrQ"/>
- </packagedElement>
- </packagedElement>
- <packagedElement xmi:type="uml:Package" xmi:id="__fRPgKMgEdyv8ePVS08H-g" name="ATM Services">
- <packagedElement xmi:type="uml:UseCase" xmi:id="_Cb9qIKMhEdyv8ePVS08H-g" name="Withdraw">
- <generalization xmi:id="_HaA4gKMhEdyv8ePVS08H-g" general="_OQbMIKMgEdy-S7gXKrJgrQ"/>
- <include xmi:id="_JmFugKMhEdyv8ePVS08H-g" addition="_LQl98KMgEdy-S7gXKrJgrQ"/>
- </packagedElement>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_DzSCYKMhEdyv8ePVS08H-g" name="Transfer Funds">
- <generalization xmi:id="_IGHwkKMhEdyv8ePVS08H-g" general="_OQbMIKMgEdy-S7gXKrJgrQ"/>
- <include xmi:id="_LeqZsKMhEdyv8ePVS08H-g" addition="_LQl98KMgEdy-S7gXKrJgrQ"/>
- </packagedElement>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_E54eEKMhEdyv8ePVS08H-g" name="Deposit Funds">
- <generalization xmi:id="_IZyTcKMhEdyv8ePVS08H-g" general="_OQbMIKMgEdy-S7gXKrJgrQ"/>
- </packagedElement>
- </packagedElement>
- <packagedElement xmi:type="uml:Package" xmi:id="_XR4wIKMhEdyv8ePVS08H-g" name="Administration">
- <packagedElement xmi:type="uml:UseCase" xmi:id="_ZidEkKMhEdyv8ePVS08H-g" name="Read Log"/>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_bq2UcKMhEdyv8ePVS08H-g" name="Register ATM in Bank"/>
- </packagedElement>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.7 - Example of use cases owned by various packages.umlusecase_diagram b/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.7 - Example of use cases owned by various packages.umlusecase_diagram
deleted file mode 100644
index d5f78d4..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.7 - Example of use cases owned by various packages.umlusecase_diagram
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_E9PJgKMgEdy-S7gXKrJgrQ" type="UMLUseCase" name="Figure 16.7 - Example of use cases owned by various packages.umlusecase_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_FLox4KMgEdy-S7gXKrJgrQ" type="2001">
- <children xmi:type="notation:Node" xmi:id="_FLpY8qMgEdy-S7gXKrJgrQ" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_FLqAAKMgEdy-S7gXKrJgrQ" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_FLqAAaMgEdy-S7gXKrJgrQ" collapsed="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_FLqAAqMgEdy-S7gXKrJgrQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_FLqAA6MgEdy-S7gXKrJgrQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_FLpY8KMgEdy-S7gXKrJgrQ" fontName="Segoe UI"/>
- <element xmi:type="uml:Package" href="Figure 16.7 - Example of use cases owned by various packages.uml#_E7pOEKMgEdy-S7gXKrJgrQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FLpY8aMgEdy-S7gXKrJgrQ"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_IimGoKMgEdy-S7gXKrJgrQ" type="2007">
- <children xmi:type="notation:Node" xmi:id="_IinUwKMgEdy-S7gXKrJgrQ" type="5008"/>
- <children xmi:type="notation:Node" xmi:id="_Iioi4KMgEdy-S7gXKrJgrQ" type="7006">
- <children xmi:type="notation:Node" xmi:id="_LQug0KMgEdy-S7gXKrJgrQ" type="3006">
- <children xmi:type="notation:Node" xmi:id="_LQvH4KMgEdy-S7gXKrJgrQ" type="5010"/>
- <children xmi:type="notation:Node" xmi:id="_LQvu8KMgEdy-S7gXKrJgrQ" type="7007">
- <styles xmi:type="notation:SortingStyle" xmi:id="_LQvu8aMgEdy-S7gXKrJgrQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_LQvu8qMgEdy-S7gXKrJgrQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_LQug0aMgEdy-S7gXKrJgrQ" fontName="Segoe UI"/>
- <element xmi:type="uml:UseCase" href="Figure 16.7 - Example of use cases owned by various packages.uml#_LQl98KMgEdy-S7gXKrJgrQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LQug0qMgEdy-S7gXKrJgrQ" x="18" y="15" height="66"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_OQ0NsKMgEdy-S7gXKrJgrQ" type="3006">
- <children xmi:type="notation:Node" xmi:id="_OQ00wKMgEdy-S7gXKrJgrQ" type="5010"/>
- <children xmi:type="notation:Node" xmi:id="_OQ00waMgEdy-S7gXKrJgrQ" type="7007">
- <styles xmi:type="notation:SortingStyle" xmi:id="_OQ00wqMgEdy-S7gXKrJgrQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_OQ00w6MgEdy-S7gXKrJgrQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_OQ0NsaMgEdy-S7gXKrJgrQ" fontName="Segoe UI"/>
- <element xmi:type="uml:UseCase" href="Figure 16.7 - Example of use cases owned by various packages.uml#_OQbMIKMgEdy-S7gXKrJgrQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OQ0NsqMgEdy-S7gXKrJgrQ" x="210" y="15" height="66"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_S3Vs4KMgEdy-S7gXKrJgrQ" type="3006">
- <children xmi:type="notation:Node" xmi:id="_S3WT8qMgEdy-S7gXKrJgrQ" type="5010"/>
- <children xmi:type="notation:Node" xmi:id="_S3W7AKMgEdy-S7gXKrJgrQ" type="7007">
- <styles xmi:type="notation:SortingStyle" xmi:id="_S3W7AaMgEdy-S7gXKrJgrQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_S3W7AqMgEdy-S7gXKrJgrQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_S3WT8KMgEdy-S7gXKrJgrQ" fontName="Segoe UI"/>
- <element xmi:type="uml:UseCase" href="Figure 16.7 - Example of use cases owned by various packages.uml#_S3CK4KMgEdy-S7gXKrJgrQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S3WT8aMgEdy-S7gXKrJgrQ" x="570" y="15" height="66"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_Iioi4aMgEdy-S7gXKrJgrQ"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Iioi4qMgEdy-S7gXKrJgrQ"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Iioi46MgEdy-S7gXKrJgrQ"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_IimGoaMgEdy-S7gXKrJgrQ" fontName="Segoe UI"/>
- <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_IimGoqMgEdy-S7gXKrJgrQ" hint="FIXME put GenEditorGenerator.modelID value here"/>
- <element xmi:type="uml:Package" href="Figure 16.7 - Example of use cases owned by various packages.uml#_IiHlgKMgEdy-S7gXKrJgrQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IimGo6MgEdy-S7gXKrJgrQ" x="120" y="12" width="841" height="181"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="__mD0AKMgEdyv8ePVS08H-g" type="2007">
- <children xmi:type="notation:Node" xmi:id="__mEbEKMgEdyv8ePVS08H-g" type="5008"/>
- <children xmi:type="notation:Node" xmi:id="__mFCIKMgEdyv8ePVS08H-g" type="7006">
- <children xmi:type="notation:Node" xmi:id="_CcRzMKMhEdyv8ePVS08H-g" type="3006">
- <children xmi:type="notation:Node" xmi:id="_CcTBUKMhEdyv8ePVS08H-g" type="5010"/>
- <children xmi:type="notation:Node" xmi:id="_CcUPcKMhEdyv8ePVS08H-g" type="7007">
- <styles xmi:type="notation:SortingStyle" xmi:id="_CcUPcaMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_CcUPcqMhEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_CcRzMaMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:UseCase" href="Figure 16.7 - Example of use cases owned by various packages.uml#_Cb9qIKMhEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CcRzMqMhEdyv8ePVS08H-g" x="18" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_DzZXIKMhEdyv8ePVS08H-g" type="3006">
- <children xmi:type="notation:Node" xmi:id="_DzZXI6MhEdyv8ePVS08H-g" type="5010"/>
- <children xmi:type="notation:Node" xmi:id="_DzZXJKMhEdyv8ePVS08H-g" type="7007">
- <styles xmi:type="notation:SortingStyle" xmi:id="_DzZXJaMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_DzZXJqMhEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_DzZXIaMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:UseCase" href="Figure 16.7 - Example of use cases owned by various packages.uml#_DzSCYKMhEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DzZXIqMhEdyv8ePVS08H-g" x="222" y="15"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_E6QRgKMhEdyv8ePVS08H-g" type="3006">
- <children xmi:type="notation:Node" xmi:id="_E6Q4kKMhEdyv8ePVS08H-g" type="5010"/>
- <children xmi:type="notation:Node" xmi:id="_E6Q4kaMhEdyv8ePVS08H-g" type="7007">
- <styles xmi:type="notation:SortingStyle" xmi:id="_E6Q4kqMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_E6Q4k6MhEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_E6QRgaMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:UseCase" href="Figure 16.7 - Example of use cases owned by various packages.uml#_E54eEKMhEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E6QRgqMhEdyv8ePVS08H-g" x="450" y="15"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="__mFCIaMgEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="__mFCIqMgEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="__mFCI6MgEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="__mD0AaMgEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="__mD0AqMgEdyv8ePVS08H-g" hint="FIXME put GenEditorGenerator.modelID value here"/>
- <element xmi:type="uml:Package" href="Figure 16.7 - Example of use cases owned by various packages.uml#__fRPgKMgEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__mD0A6MgEdyv8ePVS08H-g" x="120" y="230" width="829" height="157"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_XSP8gKMhEdyv8ePVS08H-g" type="2007">
- <children xmi:type="notation:Node" xmi:id="_XSQjkKMhEdyv8ePVS08H-g" type="5008"/>
- <children xmi:type="notation:Node" xmi:id="_XSQjkaMhEdyv8ePVS08H-g" type="7006">
- <children xmi:type="notation:Node" xmi:id="_ZikZUKMhEdyv8ePVS08H-g" type="3006">
- <children xmi:type="notation:Node" xmi:id="_ZikZU6MhEdyv8ePVS08H-g" type="5010"/>
- <children xmi:type="notation:Node" xmi:id="_ZilAYKMhEdyv8ePVS08H-g" type="7007">
- <styles xmi:type="notation:SortingStyle" xmi:id="_ZilAYaMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_ZilAYqMhEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_ZikZUaMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:UseCase" href="Figure 16.7 - Example of use cases owned by various packages.uml#_ZidEkKMhEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZikZUqMhEdyv8ePVS08H-g" x="102" y="3"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_bq9pMKMhEdyv8ePVS08H-g" type="3006">
- <children xmi:type="notation:Node" xmi:id="_bq9pM6MhEdyv8ePVS08H-g" type="5010"/>
- <children xmi:type="notation:Node" xmi:id="_bq9pNKMhEdyv8ePVS08H-g" type="7007">
- <styles xmi:type="notation:SortingStyle" xmi:id="_bq9pNaMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_bq9pNqMhEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_bq9pMaMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:UseCase" href="Figure 16.7 - Example of use cases owned by various packages.uml#_bq2UcKMhEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bq9pMqMhEdyv8ePVS08H-g" x="316" y="6"/>
- </children>
- <styles xmi:type="notation:DrawerStyle" xmi:id="_XSQjkqMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_XSQjk6MhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_XSQjlKMhEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_XSP8gaMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <styles xmi:type="notation:HintedDiagramLinkStyle" xmi:id="_XSP8gqMhEdyv8ePVS08H-g" hint="FIXME put GenEditorGenerator.modelID value here"/>
- <element xmi:type="uml:Package" href="Figure 16.7 - Example of use cases owned by various packages.uml#_XR4wIKMhEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XSP8g6MhEdyv8ePVS08H-g" x="120" y="420" width="685" height="145"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_E9PJgaMgEdy-S7gXKrJgrQ"/>
- <element xmi:type="uml:Package" href="Figure 16.7 - Example of use cases owned by various packages.uml#_E7pOEKMgEdy-S7gXKrJgrQ"/>
- <edges xmi:type="notation:Edge" xmi:id="_8ougMKMgEdyv8ePVS08H-g" type="4002" source="_S3Vs4KMgEdy-S7gXKrJgrQ" target="_OQ0NsKMgEdy-S7gXKrJgrQ">
- <children xmi:type="notation:Node" xmi:id="_8oxjgKMgEdyv8ePVS08H-g" type="6002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_8oxjgaMgEdyv8ePVS08H-g" x="4" y="-22"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_8ougMaMgEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_8ougMqMgEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Extend" href="Figure 16.7 - Example of use cases owned by various packages.uml#_8oa-MKMgEdyv8ePVS08H-g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8ougM6MgEdyv8ePVS08H-g" points="[-3, 0, 225, 0]$[-217, 0, 11, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8pYAcKMgEdyv8ePVS08H-g" id="(0.021428572,0.5151515)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_8pYAcaMgEdyv8ePVS08H-g" id="(0.9495413,0.5151515)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_HaNs0KMhEdyv8ePVS08H-g" type="4003" source="_CcRzMKMhEdyv8ePVS08H-g" target="_OQ0NsKMgEdy-S7gXKrJgrQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_HaNs0aMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_HaNs0qMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Generalization" href="Figure 16.7 - Example of use cases owned by various packages.uml#_HaA4gKMhEdyv8ePVS08H-g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HaNs06MhEdyv8ePVS08H-g" points="[7, -10, -144, 193]$[106, -193, -45, 10]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HaahIKMhEdyv8ePVS08H-g" id="(0.6357143,0.16666667)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HabIMKMhEdyv8ePVS08H-g" id="(0.20642202,0.7121212)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_IGI-sKMhEdyv8ePVS08H-g" type="4003" source="_DzZXIKMhEdyv8ePVS08H-g" target="_OQ0NsKMgEdy-S7gXKrJgrQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_IGI-saMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_IGI-sqMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Generalization" href="Figure 16.7 - Example of use cases owned by various packages.uml#_IGHwkKMhEdyv8ePVS08H-g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IGI-s6MhEdyv8ePVS08H-g" points="[7, -8, 6, 200]$[7, -175, 6, 33]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IGMCAKMhEdyv8ePVS08H-g" id="(0.6,0.13333334)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_IZzhkKMhEdyv8ePVS08H-g" type="4003" source="_E6QRgKMhEdyv8ePVS08H-g" target="_OQ0NsKMgEdy-S7gXKrJgrQ">
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_IZzhkaMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_IZzhkqMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Generalization" href="Figure 16.7 - Example of use cases owned by various packages.uml#_IZyTcKMhEdyv8ePVS08H-g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IZzhk6MhEdyv8ePVS08H-g" points="[-25, -30, 221, 194]$[-140, -257, 106, -33]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_JmJ_8KMhEdyv8ePVS08H-g" type="4001" source="_CcRzMKMhEdyv8ePVS08H-g" target="_LQug0KMgEdy-S7gXKrJgrQ">
- <children xmi:type="notation:Node" xmi:id="_JmLOEKMhEdyv8ePVS08H-g" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_JmLOEaMhEdyv8ePVS08H-g" x="31" y="-74"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_JmJ_8aMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_JmJ_8qMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Include" href="Figure 16.7 - Example of use cases owned by various packages.uml#_JmFugKMhEdyv8ePVS08H-g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JmJ_86MhEdyv8ePVS08H-g" points="[-1, -9, 25, 207]$[56, -218, 82, -2]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_JmaeoKMhEdyv8ePVS08H-g" id="(0.44285715,0.15)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_LesO4KMhEdyv8ePVS08H-g" type="4001" source="_DzZXIKMhEdyv8ePVS08H-g" target="_LQug0KMgEdy-S7gXKrJgrQ">
- <children xmi:type="notation:Node" xmi:id="_LesO5KMhEdyv8ePVS08H-g" type="6001">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_LesO5aMhEdyv8ePVS08H-g" x="51" y="-30"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_LesO4aMhEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_LesO4qMhEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Include" href="Figure 16.7 - Example of use cases owned by various packages.uml#_LeqZsKMhEdyv8ePVS08H-g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LesO46MhEdyv8ePVS08H-g" points="[-16, -20, 183, 200]$[-117, -214, 82, 6]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_LetdAKMhEdyv8ePVS08H-g" id="(0.114285715,0.33333334)"/>
- </edges>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.9 - Example of the classifier based notation for a use case.uml b/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.9 - Example of the classifier based notation for a use case.uml
deleted file mode 100644
index 81843c0..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.9 - Example of the classifier based notation for a use case.uml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<uml:Package xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_YlLHgKMiEdyv8ePVS08H-g" name="F 16-9">
- <elementImport xmi:id="_YmCqMKMiEdyv8ePVS08H-g">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Boolean"/>
- </elementImport>
- <elementImport xmi:id="_YmCqMaMiEdyv8ePVS08H-g">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#String"/>
- </elementImport>
- <elementImport xmi:id="_YmCqMqMiEdyv8ePVS08H-g">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#UnlimitedNatural"/>
- </elementImport>
- <elementImport xmi:id="_YmCqM6MiEdyv8ePVS08H-g">
- <importedElement xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#Integer"/>
- </elementImport>
- <packagedElement xmi:type="uml:UseCase" xmi:id="_bMr8UKMiEdyv8ePVS08H-g" name="OrderStationary (defaut view)">
- <extensionPoint xmi:id="_fcgLsKMiEdyv8ePVS08H-g" name="order created"/>
- <extensionPoint xmi:id="_ie8B8KMiEdyv8ePVS08H-g" name="order processed"/>
- <extensionPoint xmi:id="_ipBLAKMiEdyv8ePVS08H-g" name="order cancelled"/>
- <extensionPoint xmi:id="_ivrMoKMiEdyv8ePVS08H-g" name="order rejected"/>
- <extensionPoint xmi:id="_i1uKQKMiEdyv8ePVS08H-g" name="order completed"/>
- <extensionPoint xmi:id="_jIvM4KMiEdyv8ePVS08H-g" name="order destroyed"/>
- </packagedElement>
- <packagedElement xmi:type="uml:Actor" xmi:id="_QuEy8KMjEdy95JpKFOppXQ" name="Actor 2"/>
-</uml:Package>
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.9 - Example of the classifier based notation for a use case.umlusecase_diagram b/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.9 - Example of the classifier based notation for a use case.umlusecase_diagram
deleted file mode 100644
index 310c3ee..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/examples/Figure 16.9 - Example of the classifier based notation for a use case.umlusecase_diagram
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:uml="http://www.eclipse.org/uml2/2.1.0/UML" xmi:id="_YmCqNKMiEdyv8ePVS08H-g" type="UMLUseCase" name="Figure 16.9 - Example of the classifier based notation for a use case.umlusecase_diagram" measurementUnit="Pixel">
- <children xmi:type="notation:Node" xmi:id="_Y0c5oKMiEdyv8ePVS08H-g" type="2001">
- <children xmi:type="notation:Node" xmi:id="_Y0c5o6MiEdyv8ePVS08H-g" type="5001"/>
- <children xmi:type="notation:Node" xmi:id="_Y0c5pKMiEdyv8ePVS08H-g" type="7001">
- <styles xmi:type="notation:DrawerStyle" xmi:id="_Y0c5paMiEdyv8ePVS08H-g" collapsed="true"/>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Y0c5pqMiEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Y0c5p6MiEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Y0c5oaMiEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:Package" href="Figure 16.9 - Example of the classifier based notation for a use case.uml#_YlLHgKMiEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y0c5oqMiEdyv8ePVS08H-g"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_rDQzcKMiEdyv8ePVS08H-g" type="Note">
- <children xmi:type="notation:Node" xmi:id="_rDT2wKMiEdyv8ePVS08H-g" type="DiagramName">
- <element xsi:nil="true"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_rDT2waMiEdyv8ePVS08H-g" type="Description">
- <element xsi:nil="true"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_rDQzcaMiEdyv8ePVS08H-g" fontName="Segoe UI" description="Use "Change Notation" popup menu to show Use Case or Actor as a Classifier" fillColor="13369343" lineColor="6737151"/>
- <element xsi:nil="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rDQzcqMiEdyv8ePVS08H-g" x="204" y="24" width="277" height="49"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zNd0wKMiEdyv8ePVS08H-g" type="2003">
- <children xmi:type="notation:Node" xmi:id="_zNd0w6MiEdyv8ePVS08H-g" type="5003"/>
- <children xmi:type="notation:Node" xmi:id="_zNd0xKMiEdyv8ePVS08H-g" type="7002">
- <styles xmi:type="notation:SortingStyle" xmi:id="_zNd0xaMiEdyv8ePVS08H-g"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_zNd0xqMiEdyv8ePVS08H-g"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_zNd0waMiEdyv8ePVS08H-g" fontName="Segoe UI"/>
- <element xmi:type="uml:UseCase" href="Figure 16.9 - Example of the classifier based notation for a use case.uml#_bMr8UKMiEdyv8ePVS08H-g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zNd0wqMiEdyv8ePVS08H-g" x="36" y="156"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_N3Lb8AcIEd27Mejnzzqu9w" type="2002">
- <children xmi:type="notation:Node" xmi:id="_N3Lb8wcIEd27Mejnzzqu9w" type="5002">
- <layoutConstraint xmi:type="notation:Location" xmi:id="_N3Lb9AcIEd27Mejnzzqu9w" y="5"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_N3Lb8QcIEd27Mejnzzqu9w"/>
- <element xmi:type="uml:Actor" href="Figure 16.9 - Example of the classifier based notation for a use case.uml#_QuEy8KMjEdy95JpKFOppXQ"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_N3Lb8gcIEd27Mejnzzqu9w" x="360" y="168"/>
- </children>
- <styles xmi:type="notation:DiagramStyle" xmi:id="_YmCqNaMiEdyv8ePVS08H-g"/>
- <element xmi:type="uml:Package" href="Figure 16.9 - Example of the classifier based notation for a use case.uml#_YlLHgKMiEdyv8ePVS08H-g"/>
-</notation:Diagram>
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/plugin.properties b/tests/org.eclipse.uml2.diagram.usecase.tests/plugin.properties
deleted file mode 100644
index 0179d0a..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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:
-# Tatiana Fesenko - initial API and implementation
-###############################################################################
-pluginName=UML2 Use Case Diagram Tests Plug-in
-providerName=Eclipse.org
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/plugin.xml b/tests/org.eclipse.uml2.diagram.usecase.tests/plugin.xml
deleted file mode 100644
index fe9c6cc..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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:
- Michael Golubev (Borland) - initial API and implementation
--->
-
-<plugin>
-</plugin>
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/AllTests.java b/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/AllTests.java
deleted file mode 100644
index 28ef86a..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/AllTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.uml2.diagram.usecase.tests;
-
-import org.eclipse.uml2.diagram.usecase.tests.tool.ChildrenGroupTest;
-import org.eclipse.uml2.diagram.usecase.tests.tool.NodesGroupTest;
-import org.eclipse.uml2.diagram.usecase.tests.whole.TestWholeDiagramSuite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.uml2.diagram.usecase");
- //$JUnit-BEGIN$
- suite.addTest(new TestWholeDiagramSuite());
- suite.addTestSuite(NodesGroupTest.class);
- suite.addTestSuite(ChildrenGroupTest.class);
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/UseCaseDiagramFacade.java b/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/UseCaseDiagramFacade.java
deleted file mode 100644
index dbaa82f..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/UseCaseDiagramFacade.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.uml2.diagram.usecase.tests;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.usecase.part.UMLDiagramEditorUtil;
-
-
-public class UseCaseDiagramFacade extends UMLDiagramFacade {
-
- public UseCaseDiagramFacade(String path) {
- super(path, DIAGRAM_FILE_EXTENSION);
- }
-
- @Override
- protected Resource createDiagram(URI diagramModelURI, URI domainModelURI) {
- return UMLDiagramEditorUtil.createDiagram(diagramModelURI, domainModelURI, new NullProgressMonitor());
- }
-
- public static final String DIAGRAM_FILE_EXTENSION = "umlusecase_diagram";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/tool/ChildrenGroupTest.java b/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/tool/ChildrenGroupTest.java
deleted file mode 100644
index 8491434..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/tool/ChildrenGroupTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.eclipse.uml2.diagram.usecase.tests.tool;
-
-import java.util.Collections;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.tools.UnspecifiedTypeCreationTool;
-import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;
-import org.eclipse.uml2.diagram.usecase.edit.parts.DiagramHeaderEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.ElementImportEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.ExtensionPoint2EditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.ExtensionPointEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.PackageImportsEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.UseCaseAsClassEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.UseCaseAsClassExtensionPointsEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.UseCaseEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.UseCaseExtensionPointsEditPart;
-import org.eclipse.uml2.diagram.usecase.part.UMLPaletteFactory;
-import org.eclipse.uml2.diagram.usecase.part.UMLVisualIDRegistry;
-
-public class ChildrenGroupTest extends UseCaseCreationToolTestBase {
-
- /**
- * @generated
- */
- PaletteRoot myRoot;
-
- /**
- * @generated
- */
- Tool myExtensionPointTool;
-
- /**
- * @generated
- */
- Tool myElementImportTool;
-
- /**
- * @generated
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- myRoot = new PaletteRoot();
- new UMLPaletteFactory().fillPalette(myRoot);
- myExtensionPointTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(0)).createTool();
- myElementImportTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(1)).getChildren().get(1)).createTool();
- }
-
- /**
- * @generated
- */
- @Override
- protected void tearDown() throws Exception {
- myRoot = null;
- myExtensionPointTool = null;
- myElementImportTool = null;
-
- super.tearDown();
- }
-
- /**
- * @generated
- */
- public ChildrenGroupTest(String name) {
- super(name);
- }
-
- /**
- * @generated
- */
- public void testElementImport() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- IGraphicalEditPart editPart1 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(DiagramHeaderEditPart.VISUAL_ID));
- assertNotNull(editPart1);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment1 = editPart1.getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageImportsEditPart.VISUAL_ID));
- assertNotNull(compartment1);
-
- createNodeByTool(myElementImportTool, 10, 10);
-
- IGraphicalEditPart editPart2 = compartment1.getChildBySemanticHint(UMLVisualIDRegistry.getType(ElementImportEditPart.VISUAL_ID));
- assertNotNull(editPart2);
- assertEquals("ElementImport", getMetaclassName(editPart2));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testExtPointInUseCase() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
- Tool tool1;
- tool1 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.usecase.UseCase_2003")));
-
- createNodeByTool(tool1, 200, 100);
-
- IGraphicalEditPart editPart3 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseEditPart.VISUAL_ID));
- assertNotNull(editPart3);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment2 = editPart3.getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseExtensionPointsEditPart.VISUAL_ID));
- assertNotNull(compartment2);
-
- createNodeByTool(myExtensionPointTool, 200, 100);
-
- IGraphicalEditPart editPart4 = compartment2.getChildBySemanticHint(UMLVisualIDRegistry.getType(ExtensionPointEditPart.VISUAL_ID));
- assertNotNull(editPart4);
- assertEquals("ExtensionPoint", getMetaclassName(editPart4));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testExtPointInUseCaseAsClass() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
- Tool tool2;
- tool2 = new UnspecifiedTypeCreationTool(Collections.singletonList(ElementTypeRegistry.getInstance().getType("org.eclipse.uml2.diagram.usecase.UseCase_2004")));
-
- createNodeByTool(tool2, 200, 100);
-
- IGraphicalEditPart editPart5 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseAsClassEditPart.VISUAL_ID));
- assertNotNull(editPart5);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment3 = editPart5.getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseAsClassExtensionPointsEditPart.VISUAL_ID));
- assertNotNull(compartment3);
-
- createNodeByTool(myExtensionPointTool, 200, 100);
-
- IGraphicalEditPart editPart6 = compartment3.getChildBySemanticHint(UMLVisualIDRegistry.getType(ExtensionPoint2EditPart.VISUAL_ID));
- assertNotNull(editPart6);
- assertEquals("ExtensionPoint", getMetaclassName(editPart6));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
-
- private static java.lang.String getMetaclassName(IGraphicalEditPart editPart) {
- return editPart.getNotationView().getElement().eClass().getName();
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/tool/NodesGroupTest.java b/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/tool/NodesGroupTest.java
deleted file mode 100644
index 1361f43..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/tool/NodesGroupTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package org.eclipse.uml2.diagram.usecase.tests.tool;
-
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.ActorEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.ActorInPackageEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.ConstraintEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.InnerUseCaseEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.NestedPackageEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.PackageFramecontentsEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.SubjectEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.SubjectUsecasesEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.UseCaseEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.UseCaseinPackageEditPart;
-import org.eclipse.uml2.diagram.usecase.part.UMLPaletteFactory;
-import org.eclipse.uml2.diagram.usecase.part.UMLVisualIDRegistry;
-
-public class NodesGroupTest extends UseCaseCreationToolTestBase {
-
- /**
- * @generated
- */
- PaletteRoot myRoot;
-
- /**
- * @generated
- */
- Tool myUseCaseTool;
-
- /**
- * @generated
- */
- Tool myActorTool;
-
- /**
- * @generated
- */
- Tool mySubjectTool;
-
- /**
- * @generated
- */
- Tool myPackageTool;
-
- /**
- * @generated
- */
- Tool myConstraintTool;
-
- /**
- * @generated
- */
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- myRoot = new PaletteRoot();
- new UMLPaletteFactory().fillPalette(myRoot);
- myUseCaseTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(0)).createTool();
- myActorTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(1)).createTool();
- mySubjectTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(2)).createTool();
- myPackageTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(3)).createTool();
- myConstraintTool = ((ToolEntry) ((PaletteContainer) myRoot.getChildren().get(0)).getChildren().get(4)).createTool();
- }
-
- /**
- * @generated
- */
- @Override
- protected void tearDown() throws Exception {
- myRoot = null;
- myUseCaseTool = null;
- myActorTool = null;
- mySubjectTool = null;
- myPackageTool = null;
- myConstraintTool = null;
-
- super.tearDown();
- }
-
- /**
- * @generated
- */
- public NodesGroupTest(String name) {
- super(name);
- }
-
- /**
- * @generated
- */
- public void testUseCaseInPackage() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myUseCaseTool, 200, 100);
-
- IGraphicalEditPart editPart1 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseEditPart.VISUAL_ID));
- assertNotNull(editPart1);
- assertEquals("UseCase", getMetaclassName(editPart1));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testActorInPackage() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myActorTool, 200, 100);
-
- IGraphicalEditPart editPart2 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ActorEditPart.VISUAL_ID));
- assertNotNull(editPart2);
- assertEquals("Actor", getMetaclassName(editPart2));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testSubjectInPackage() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(mySubjectTool, 200, 100);
-
- IGraphicalEditPart editPart3 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(SubjectEditPart.VISUAL_ID));
- assertNotNull(editPart3);
- assertEquals("Component", getMetaclassName(editPart3));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testPackageInPackage() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myPackageTool, 200, 100);
-
- IGraphicalEditPart editPart4 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(NestedPackageEditPart.VISUAL_ID));
- assertNotNull(editPart4);
- assertEquals("Package", getMetaclassName(editPart4));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testConstraintInPackage() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myConstraintTool, 200, 100);
-
- IGraphicalEditPart editPart5 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(ConstraintEditPart.VISUAL_ID));
- assertNotNull(editPart5);
- assertEquals("Constraint", getMetaclassName(editPart5));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testUseCaseInSubject() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(mySubjectTool, 200, 100);
-
- IGraphicalEditPart editPart6 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(SubjectEditPart.VISUAL_ID));
- assertNotNull(editPart6);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment1 = editPart6.getChildBySemanticHint(UMLVisualIDRegistry.getType(SubjectUsecasesEditPart.VISUAL_ID));
- assertNotNull(compartment1);
-
- createNodeByTool(myUseCaseTool, 201, 130);
-
- IGraphicalEditPart editPart7 = compartment1.getChildBySemanticHint(UMLVisualIDRegistry.getType(InnerUseCaseEditPart.VISUAL_ID));
- assertNotNull(editPart7);
- assertEquals("UseCase", getMetaclassName(editPart7));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testUseCaseInNestedPackage() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myPackageTool, 200, 100);
-
- IGraphicalEditPart editPart8 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(NestedPackageEditPart.VISUAL_ID));
- assertNotNull(editPart8);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment2 = editPart8.getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageFramecontentsEditPart.VISUAL_ID));
- assertNotNull(compartment2);
-
- createNodeByTool(myUseCaseTool, 201, 130);
-
- IGraphicalEditPart editPart9 = compartment2.getChildBySemanticHint(UMLVisualIDRegistry.getType(UseCaseinPackageEditPart.VISUAL_ID));
- assertNotNull(editPart9);
- assertEquals("UseCase", getMetaclassName(editPart9));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
- public void testActorInNestedPackage() {
- IGraphicalEditPart diagramEditPart = getDiagramEditPart();
-
- createNodeByTool(myPackageTool, 200, 100);
-
- IGraphicalEditPart editPart10 = diagramEditPart.getChildBySemanticHint(UMLVisualIDRegistry.getType(NestedPackageEditPart.VISUAL_ID));
- assertNotNull(editPart10);
-
- getDiagramEditPart().getViewer().flush();
-
- IGraphicalEditPart compartment3 = editPart10.getChildBySemanticHint(UMLVisualIDRegistry.getType(PackageFramecontentsEditPart.VISUAL_ID));
- assertNotNull(compartment3);
-
- createNodeByTool(myActorTool, 201, 130);
-
- IGraphicalEditPart editPart11 = compartment3.getChildBySemanticHint(UMLVisualIDRegistry.getType(ActorInPackageEditPart.VISUAL_ID));
- assertNotNull(editPart11);
- assertEquals("Actor", getMetaclassName(editPart11));
- getDiagramEditPart().getViewer().flush();
-
- }
-
- /**
- * @generated
- */
-
- private static java.lang.String getMetaclassName(IGraphicalEditPart editPart) {
- return editPart.getNotationView().getElement().eClass().getName();
- }
-}
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/tool/UseCaseCreationToolTestBase.java b/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/tool/UseCaseCreationToolTestBase.java
deleted file mode 100644
index 5a10986..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/tool/UseCaseCreationToolTestBase.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.uml2.diagram.usecase.tests.tool;
-
-import org.eclipse.uml2.diagram.common.tests.UMLDiagramFacade;
-import org.eclipse.uml2.diagram.common.tool.CreationToolTestBase;
-
-public class UseCaseCreationToolTestBase extends CreationToolTestBase {
-
- public UseCaseCreationToolTestBase(String name) {
- super(name);
- }
-
- @Override
- protected UMLDiagramFacade getDiagram(String projectPath) {
- return new org.eclipse.uml2.diagram.usecase.tests.UseCaseDiagramFacade(projectPath);
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/whole/TestWholeDiagramSuite.java b/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/whole/TestWholeDiagramSuite.java
deleted file mode 100644
index 9c8487e..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/whole/TestWholeDiagramSuite.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.uml2.diagram.usecase.tests.whole;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.uml2.diagram.usecase.tests.UseCaseDiagramFacade;
-
-import junit.framework.TestSuite;
-
-public class TestWholeDiagramSuite extends TestSuite {
-
- public TestWholeDiagramSuite() {
- for (String name : oursDiagramFiles) {
- addTest(new TestWholeUseCaseDiagram(name + ".uml", name + "." + UseCaseDiagramFacade.DIAGRAM_FILE_EXTENSION));
- }
-
- }
-
- private static List<String> oursDiagramFiles = new ArrayList<String>();
- static {
- oursDiagramFiles.add("Figure 16.10 - UseCase diagram with a rectangle representing the boundary of the subject");
- // test fails because it contains link to link, hence, diagram refresh is needed. see UMLInitDiagramFacade#refreshDiagram()
- oursDiagramFiles.add("Figure 16.3 - Example of an extend relationship between use cases");
- oursDiagramFiles.add("Figure 16.7 - Example of use cases owned by various packages");
- oursDiagramFiles.add("Figure 16.9 - Example of the classifier based notation for a use case");
- }
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/whole/TestWholeUseCaseDiagram.java b/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/whole/TestWholeUseCaseDiagram.java
deleted file mode 100644
index a147b0d..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/src/org/eclipse/uml2/diagram/usecase/tests/whole/TestWholeUseCaseDiagram.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.uml2.diagram.usecase.tests.whole;
-
-import java.net.URL;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gmf.runtime.diagram.core.services.ViewService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.uml2.diagram.common.wholediagram.TestWholeDiagram;
-import org.eclipse.uml2.diagram.common.wholediagram.UMLInitDiagramFacade;
-import org.eclipse.uml2.diagram.usecase.edit.parts.DiagramHeaderEditPart;
-import org.eclipse.uml2.diagram.usecase.edit.parts.PackageEditPart;
-import org.eclipse.uml2.diagram.usecase.part.UMLDiagramEditor;
-import org.eclipse.uml2.diagram.usecase.part.UMLDiagramEditorPlugin;
-import org.osgi.framework.Bundle;
-
-public class TestWholeUseCaseDiagram extends TestWholeDiagram {
-
- public TestWholeUseCaseDiagram(String modelFileName, String diagramFileName) {
- super(modelFileName, diagramFileName);
- }
-
- @Override
- protected UMLInitDiagramFacade getInitDiagramFacade(IFile modelFile, IFile diagramFile) {
- return new UMLInitDiagramFacade(modelFile, diagramFile, UMLDiagramEditor.ID) {
-
- @Override
- protected Diagram createDiagramView(EObject modelRoot) {
- return ViewService.createDiagram(modelRoot, PackageEditPart.MODEL_ID, UMLDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT);
- }
- };
- }
-
- @Override
- protected URL findFileInTestPlugin(String fileName) {
- return FileLocator.find(UML_TEST_BUNDLE, new Path(EXAMPLE_FOLDER).append(fileName), Collections.EMPTY_MAP);
- }
-
- @Override
- protected boolean ignoreView(int visualId) {
- return super.ignoreView(visualId) || DiagramHeaderEditPart.VISUAL_ID == visualId;
- }
-
- private final static Bundle UML_TEST_BUNDLE = Platform.getBundle("org.eclipse.uml2.diagram.usecase.tests");
-
- private final static String EXAMPLE_FOLDER = "examples/";
-
-}
diff --git a/tests/org.eclipse.uml2.diagram.usecase.tests/test.xml b/tests/org.eclipse.uml2.diagram.usecase.tests/test.xml
deleted file mode 100644
index 072edfb..0000000
--- a/tests/org.eclipse.uml2.diagram.usecase.tests/test.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-
-<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.uml2.diagram.usecase.tests"/>
- <property name="library-file" value="${eclipse-home}/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="uml2-tools-folder" value="${eclipse-home}/uml2_tools_folder"/>
- <delete dir="${uml2-tools-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${uml2-tools-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.uml2.diagram.usecase.tests.AllTests"/>
- <property name="vmargs" value="-ea -Xmx512M"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
diff --git a/tests/org.eclipse.uml2tools.tests-feature/.project b/tests/org.eclipse.uml2tools.tests-feature/.project
deleted file mode 100644
index 5c51093..0000000
--- a/tests/org.eclipse.uml2tools.tests-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.uml2tools.tests-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/tests/org.eclipse.uml2tools.tests-feature/build.properties b/tests/org.eclipse.uml2tools.tests-feature/build.properties
deleted file mode 100644
index 2477a55..0000000
--- a/tests/org.eclipse.uml2tools.tests-feature/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = feature.xml,\
- copyright.txt,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- feature.properties,\
- license.html
-src.includes = epl-v10.html,\
- license.html
-root=rootfiles
diff --git a/tests/org.eclipse.uml2tools.tests-feature/copyright.txt b/tests/org.eclipse.uml2tools.tests-feature/copyright.txt
deleted file mode 100644
index 29ad511..0000000
--- a/tests/org.eclipse.uml2tools.tests-feature/copyright.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (c) 2006, 2007 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:
- Michael Golubev (Borland) - initial API and implementation
diff --git a/tests/org.eclipse.uml2tools.tests-feature/eclipse_update_120.jpg b/tests/org.eclipse.uml2tools.tests-feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e02..0000000
--- a/tests/org.eclipse.uml2tools.tests-feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.uml2tools.tests-feature/epl-v10.html b/tests/org.eclipse.uml2tools.tests-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/tests/org.eclipse.uml2tools.tests-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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "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. 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]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.uml2tools.tests-feature/feature.properties b/tests/org.eclipse.uml2tools.tests-feature/feature.properties
deleted file mode 100644
index 6ee5bdc..0000000
--- a/tests/org.eclipse.uml2tools.tests-feature/feature.properties
+++ /dev/null
@@ -1,123 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 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
-###############################################################################
-
-featureName=UML2 Diagramming Tests (Incubation)
-providerName=Eclipse.org
-updateSiteName=Model Development Tools (MDT) updates
-description=UML2 Diagramming Tests
-copyrightURL=copyright.txt
-copyright=Copyright (c) 2006, 2007 Borland Software Corporation \n\
-All rights reserved. This program and the accompanying materials \n\
-are made available under the terms of the Eclipse Public License v1.0 \n\
-which accompanies this distribution, and is available at \n\
-http://www.eclipse.org/legal/epl-v10.html \n\
- \n\
-Contributors: \n\
- Michael Golubev (Borland) - initial API and implementation
-
-licenseURL=license.html
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\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 Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-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.org CVS\n\
-repository ("Repository") in CVS 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 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\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-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\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-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". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-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\
- - 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\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\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\
-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,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
diff --git a/tests/org.eclipse.uml2tools.tests-feature/feature.xml b/tests/org.eclipse.uml2tools.tests-feature/feature.xml
deleted file mode 100644
index ab7e1f6..0000000
--- a/tests/org.eclipse.uml2tools.tests-feature/feature.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.uml2tools.tests"
- label="%featureName"
- version="0.8.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/modeling/mdt/updates/"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.jface"/>
- <import plugin="org.eclipse.emf.ecore"/>
- <import plugin="org.eclipse.emf.edit.ui"/>
- <import plugin="org.eclipse.gmf.runtime.notation"/>
- <import plugin="org.eclipse.gmf.runtime.common.ui"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.gmf.runtime.emf.type.core"/>
- <import plugin="org.eclipse.uml2.diagram.clazz"/>
- </requires>
-
- <plugin
- id="org.eclipse.uml2.diagram.clazz.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.test"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.ant.optional.junit"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"/>
-
- <plugin
- id="org.eclipse.uml2.diagram.common.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.uml2.diagram.profile.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.uml2.diagram.statemachine.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/tests/org.eclipse.uml2tools.tests-feature/license.html b/tests/org.eclipse.uml2tools.tests-feature/license.html
deleted file mode 100644
index a9b560f..0000000
--- a/tests/org.eclipse.uml2tools.tests-feature/license.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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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/tests/org.eclipse.uml2tools.tests-feature/rootfiles/epl-v10.html b/tests/org.eclipse.uml2tools.tests-feature/rootfiles/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/tests/org.eclipse.uml2tools.tests-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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "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. 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]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
diff --git a/tests/org.eclipse.uml2tools.tests-feature/rootfiles/notice.html b/tests/org.eclipse.uml2tools.tests-feature/rootfiles/notice.html
deleted file mode 100644
index a9b560f..0000000
--- a/tests/org.eclipse.uml2tools.tests-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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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>
